diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-02 12:23:12 +0300 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-02 12:24:05 +0300 |
commit | 0b1c5c06a188a9dc22820e289b3ef9d6589a0df9 (patch) | |
tree | b60d8796702974781fe5c6a74e22393efb02cdd3 | |
parent | b1b18047c5e98333610716b0ef53dccbe00ca72e (diff) |
Refactored CameraPreset
Task-number: QTRD-2362
Change-Id: I11e9f457bb18f5afaece48668f9fd77b14796b73
Change-Id: I11e9f457bb18f5afaece48668f9fd77b14796b73
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
-rw-r--r-- | examples/barchart/main.cpp | 2 | ||||
-rw-r--r-- | examples/qmlbarchart/qml/qmlbarchart/main.qml | 2 | ||||
-rw-r--r-- | examples/qmlscatter/qml/qmlscatter/main.qml | 6 | ||||
-rw-r--r-- | examples/qmlsurface/qml/qmlsurface/main.qml | 2 | ||||
-rw-r--r-- | examples/rainfall/rainfallchart.cpp | 2 | ||||
-rw-r--r-- | examples/scatterchart/scatterchart.cpp | 8 | ||||
-rw-r--r-- | examples/widget/chart.cpp | 6 | ||||
-rw-r--r-- | src/datavisualization/engine/q3dcamera.cpp | 58 | ||||
-rw-r--r-- | src/datavisualization/global/qdatavisualizationenums.h | 50 | ||||
-rw-r--r-- | src/datavisualization/global/qtdatavisualizationenums.qdoc | 54 | ||||
-rw-r--r-- | src/datavisualization/utils/camerahelper.cpp | 96 | ||||
-rw-r--r-- | tests/barstest/chart.cpp | 6 | ||||
-rw-r--r-- | tests/scattertest/scatterchart.cpp | 8 |
13 files changed, 150 insertions, 150 deletions
diff --git a/examples/barchart/main.cpp b/examples/barchart/main.cpp index 0820a920..2039968c 100644 --- a/examples/barchart/main.cpp +++ b/examples/barchart/main.cpp @@ -102,7 +102,7 @@ ChartDataGenerator::ChartDataGenerator(Q3DBars *barchart, QTableWidget *tableWid m_chart->setTheme(QDataVis::ThemeDigia); // Set preset camera position - m_chart->setCameraPreset(QDataVis::PresetFront); + m_chart->setCameraPreset(QDataVis::CameraPresetFront); } ChartDataGenerator::~ChartDataGenerator() diff --git a/examples/qmlbarchart/qml/qmlbarchart/main.qml b/examples/qmlbarchart/qml/qmlbarchart/main.qml index a07a98c8..a8bca564 100644 --- a/examples/qmlbarchart/qml/qmlbarchart/main.qml +++ b/examples/qmlbarchart/qml/qmlbarchart/main.qml @@ -54,7 +54,7 @@ Item { barThickness: 0.5 barSpacing: Qt.size(0.5, 0.5) barSpacingRelative: false - cameraPreset: Bars3D.PresetRight + cameraPreset: Bars3D.CameraPresetRight columnAxis: chartAxes.column valueAxis: chartAxes.expenses itemLabelFormat: "@valueTitle for @colLabel, @rowLabel: @valueLabel" diff --git a/examples/qmlscatter/qml/qmlscatter/main.qml b/examples/qmlscatter/qml/qmlscatter/main.qml index c4fbe516..9a600867 100644 --- a/examples/qmlscatter/qml/qmlscatter/main.qml +++ b/examples/qmlscatter/qml/qmlscatter/main.qml @@ -94,10 +94,10 @@ Item { text: "Change Camera Placement" anchors.left: smoothToggle.right onClicked: { - if (testscatter.cameraPreset === Scatter3D.PresetFront) { - testscatter.cameraPreset = Scatter3D.PresetIsometricRightHigh; + if (testscatter.cameraPreset === Scatter3D.CameraPresetFront) { + testscatter.cameraPreset = Scatter3D.CameraPresetIsometricRightHigh; } else { - testscatter.cameraPreset = Scatter3D.PresetFront; + testscatter.cameraPreset = Scatter3D.CameraPresetFront; } } } diff --git a/examples/qmlsurface/qml/qmlsurface/main.qml b/examples/qmlsurface/qml/qmlsurface/main.qml index 7de2801f..c66d60e3 100644 --- a/examples/qmlsurface/qml/qmlsurface/main.qml +++ b/examples/qmlsurface/qml/qmlsurface/main.qml @@ -53,7 +53,7 @@ Item { surfaceGridEnabled: false font.family: "STCaiyun" font.pointSize: 35 - cameraPreset: Surface3D.PresetIsometricLeft + cameraPreset: Surface3D.CameraPresetIsometricLeft dataProxy: surfaceData.heightProxy axisY.min: 0.0 axisY.max: 250.0 diff --git a/examples/rainfall/rainfallchart.cpp b/examples/rainfall/rainfallchart.cpp index a454b79a..3ec400b1 100644 --- a/examples/rainfall/rainfallchart.cpp +++ b/examples/rainfall/rainfallchart.cpp @@ -72,7 +72,7 @@ RainfallChart::RainfallChart(Q3DBars *rainfall) m_chart->setTheme(QDataVis::ThemeArmyBlue); // Set preset camera position - m_chart->setCameraPreset(QDataVis::PresetIsometricRightHigh); + m_chart->setCameraPreset(QDataVis::CameraPresetIsometricRightHigh); // Disable grid m_chart->setGridVisible(false); diff --git a/examples/scatterchart/scatterchart.cpp b/examples/scatterchart/scatterchart.cpp index bd101527..be5db0d3 100644 --- a/examples/scatterchart/scatterchart.cpp +++ b/examples/scatterchart/scatterchart.cpp @@ -38,7 +38,7 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter) m_chart->setObjectType(QDataVis::Spheres, true); m_chart->setTheme(QDataVis::ThemeEbony); m_chart->setShadowQuality(QDataVis::ShadowQualityHigh); - m_chart->setCameraPreset(QDataVis::PresetFront); + m_chart->setCameraPreset(QDataVis::CameraPresetFront); m_chart->setAxisX(new Q3DValueAxis); m_chart->setAxisY(new Q3DValueAxis); m_chart->setAxisZ(new Q3DValueAxis); @@ -109,12 +109,12 @@ void ScatterDataModifier::changeTheme(int theme) void ScatterDataModifier::changePresetCamera() { - static int preset = QDataVis::PresetFrontLow; + static int preset = QDataVis::CameraPresetFrontLow; m_chart->setCameraPreset((QDataVis::CameraPreset)preset); - if (++preset > QDataVis::PresetDirectlyAboveCCW45) - preset = QDataVis::PresetFrontLow; + if (++preset > QDataVis::CameraPresetDirectlyAboveCCW45) + preset = QDataVis::CameraPresetFrontLow; } void ScatterDataModifier::changeLabelStyle() diff --git a/examples/widget/chart.cpp b/examples/widget/chart.cpp index c9145a36..5f7cd96a 100644 --- a/examples/widget/chart.cpp +++ b/examples/widget/chart.cpp @@ -131,12 +131,12 @@ void ChartModifier::changeStyle(int style) void ChartModifier::changePresetCamera() { - static int preset = QDataVis::PresetFrontLow; + static int preset = QDataVis::CameraPresetFrontLow; m_chart->setCameraPreset((QDataVis::CameraPreset)preset); - if (++preset > QDataVis::PresetDirectlyBelow) - preset = QDataVis::PresetFrontLow; + if (++preset > QDataVis::CameraPresetDirectlyBelow) + preset = QDataVis::CameraPresetFrontLow; } void ChartModifier::changeTheme(int theme) diff --git a/src/datavisualization/engine/q3dcamera.cpp b/src/datavisualization/engine/q3dcamera.cpp index a3f46a17..6b91cac8 100644 --- a/src/datavisualization/engine/q3dcamera.cpp +++ b/src/datavisualization/engine/q3dcamera.cpp @@ -98,8 +98,8 @@ QPointF Q3DCamera::rotations() const void Q3DCamera::setRotations(const QPointF &rotation) { d_ptr->setRotations(rotation); - if (d_ptr->m_activePreset != QDataVis::NoPreset) { - d_ptr->m_activePreset = QDataVis::NoPreset; + if (d_ptr->m_activePreset != QDataVis::CameraPresetNone) { + d_ptr->m_activePreset = QDataVis::CameraPresetNone; setDirty(true); } } @@ -165,7 +165,7 @@ void Q3DCamera::setViewMatrixAutoUpdateEnabled(bool isEnabled) * \property Q3DCamera::cameraPreset * * This property contains the currently active camera preset, - * if no preset is active the value is QDataVis::NoPreset. + * if no preset is active the value is QDataVis::CameraPresetNone. * \note The base camera orientation set by setBaseOrientation() will affect * the presets as all calculations are based on those values. */ @@ -177,104 +177,104 @@ QDataVis::CameraPreset Q3DCamera::cameraPreset() void Q3DCamera::setCameraPreset(QDataVis::CameraPreset preset) { switch (preset) { - case QDataVis::PresetFrontLow: { + case QDataVis::CameraPresetFrontLow: { d_ptr->setRotations(QPointF(0.0f, 0.0f)); break; } - case QDataVis::PresetFront: { + case QDataVis::CameraPresetFront: { d_ptr->setRotations(QPointF(0.0f, 22.5f)); break; } - case QDataVis::PresetFrontHigh: { + case QDataVis::CameraPresetFrontHigh: { d_ptr->setRotations(QPointF(0.0f, 45.0f)); break; } - case QDataVis::PresetLeftLow: { + case QDataVis::CameraPresetLeftLow: { d_ptr->setRotations(QPointF(90.0f, 0.0f)); break; } - case QDataVis::PresetLeft: { + case QDataVis::CameraPresetLeft: { d_ptr->setRotations(QPointF(90.0f, 22.5f)); break; } - case QDataVis::PresetLeftHigh: { + case QDataVis::CameraPresetLeftHigh: { d_ptr->setRotations(QPointF(90.0f, 45.0f)); break; } - case QDataVis::PresetRightLow: { + case QDataVis::CameraPresetRightLow: { d_ptr->setRotations(QPointF(-90.0f, 0.0f)); break; } - case QDataVis::PresetRight: { + case QDataVis::CameraPresetRight: { d_ptr->setRotations(QPointF(-90.0f, 22.5f)); break; } - case QDataVis::PresetRightHigh: { + case QDataVis::CameraPresetRightHigh: { d_ptr->setRotations(QPointF(-90.0f, 45.0f)); break; } - case QDataVis::PresetBehindLow: { + case QDataVis::CameraPresetBehindLow: { d_ptr->setRotations(QPointF(180.0f, 0.0f)); break; } - case QDataVis::PresetBehind: { + case QDataVis::CameraPresetBehind: { d_ptr->setRotations(QPointF(180.0f, 22.5f)); break; } - case QDataVis::PresetBehindHigh: { + case QDataVis::CameraPresetBehindHigh: { d_ptr->setRotations(QPointF(180.0f, 45.0f)); break; } - case QDataVis::PresetIsometricLeft: { + case QDataVis::CameraPresetIsometricLeft: { d_ptr->setRotations(QPointF(45.0f, 22.5f)); break; } - case QDataVis::PresetIsometricLeftHigh: { + case QDataVis::CameraPresetIsometricLeftHigh: { d_ptr->setRotations(QPointF(45.0f, 45.0f)); break; } - case QDataVis::PresetIsometricRight: { + case QDataVis::CameraPresetIsometricRight: { d_ptr->setRotations(QPointF(-45.0f, 22.5f)); break; } - case QDataVis::PresetIsometricRightHigh: { + case QDataVis::CameraPresetIsometricRightHigh: { d_ptr->setRotations(QPointF(-45.0f, 45.0f)); break; } - case QDataVis::PresetDirectlyAbove: { + case QDataVis::CameraPresetDirectlyAbove: { d_ptr->setRotations(QPointF(0.0f, 90.0f)); break; } - case QDataVis::PresetDirectlyAboveCW45: { + case QDataVis::CameraPresetDirectlyAboveCW45: { d_ptr->setRotations(QPointF(-45.0f, 90.0f)); break; } - case QDataVis::PresetDirectlyAboveCCW45: { + case QDataVis::CameraPresetDirectlyAboveCCW45: { d_ptr->setRotations(QPointF(45.0f, 90.0f)); break; } - case QDataVis::PresetFrontBelow: { + case QDataVis::CameraPresetFrontBelow: { d_ptr->setRotations(QPointF(0.0f, -45.0f)); break; } - case QDataVis::PresetLeftBelow: { + case QDataVis::CameraPresetLeftBelow: { d_ptr->setRotations(QPointF(90.0f, -45.0f)); break; } - case QDataVis::PresetRightBelow: { + case QDataVis::CameraPresetRightBelow: { d_ptr->setRotations(QPointF(-90.0f, -45.0f)); break; } - case QDataVis::PresetBehindBelow: { + case QDataVis::CameraPresetBehindBelow: { d_ptr->setRotations(QPointF(180.0f, -45.0f)); break; } - case QDataVis::PresetDirectlyBelow: { + case QDataVis::CameraPresetDirectlyBelow: { d_ptr->setRotations(QPointF(0.0f, -90.0f)); break; } default: - preset = QDataVis::NoPreset; + preset = QDataVis::CameraPresetNone; break; } @@ -343,7 +343,7 @@ Q3DCameraPrivate::Q3DCameraPrivate(Q3DCamera *q) : m_xRotation(0.0f), m_yRotation(0.0f), m_zoomLevel(100), - m_activePreset(QDataVis::NoPreset) + m_activePreset(QDataVis::CameraPresetNone) { } diff --git a/src/datavisualization/global/qdatavisualizationenums.h b/src/datavisualization/global/qdatavisualizationenums.h index 0115c7cc..d76e54e1 100644 --- a/src/datavisualization/global/qdatavisualizationenums.h +++ b/src/datavisualization/global/qdatavisualizationenums.h @@ -56,31 +56,31 @@ public: }; enum CameraPreset { - NoPreset = -1, - PresetFrontLow = 0, - PresetFront, - PresetFrontHigh, - PresetLeftLow, - PresetLeft, - PresetLeftHigh, - PresetRightLow, - PresetRight, - PresetRightHigh, - PresetBehindLow, - PresetBehind, - PresetBehindHigh, - PresetIsometricLeft, - PresetIsometricLeftHigh, - PresetIsometricRight, - PresetIsometricRightHigh, - PresetDirectlyAbove, - PresetDirectlyAboveCW45, - PresetDirectlyAboveCCW45, - PresetFrontBelow, - PresetLeftBelow, - PresetRightBelow, - PresetBehindBelow, - PresetDirectlyBelow + CameraPresetNone = -1, + CameraPresetFrontLow = 0, + CameraPresetFront, + CameraPresetFrontHigh, + CameraPresetLeftLow, + CameraPresetLeft, + CameraPresetLeftHigh, + CameraPresetRightLow, + CameraPresetRight, + CameraPresetRightHigh, + CameraPresetBehindLow, + CameraPresetBehind, + CameraPresetBehindHigh, + CameraPresetIsometricLeft, + CameraPresetIsometricLeftHigh, + CameraPresetIsometricRight, + CameraPresetIsometricRightHigh, + CameraPresetDirectlyAbove, + CameraPresetDirectlyAboveCW45, + CameraPresetDirectlyAboveCCW45, + CameraPresetFrontBelow, + CameraPresetLeftBelow, + CameraPresetRightBelow, + CameraPresetBehindBelow, + CameraPresetDirectlyBelow }; enum Theme { diff --git a/src/datavisualization/global/qtdatavisualizationenums.qdoc b/src/datavisualization/global/qtdatavisualizationenums.qdoc index b549bf8d..4d6d651a 100644 --- a/src/datavisualization/global/qtdatavisualizationenums.qdoc +++ b/src/datavisualization/global/qtdatavisualizationenums.qdoc @@ -67,35 +67,35 @@ Predefined positions for camera. - \value NoPreset + \value CameraPresetNone Used to indicate a preset has not been set, or the scene has been rotated freely. - \value PresetFrontLow - \value PresetFront - \value PresetFrontHigh - \value PresetLeftLow - \value PresetLeft - \value PresetLeftHigh - \value PresetRightLow - \value PresetRight - \value PresetRightHigh - \value PresetBehindLow - \value PresetBehind - \value PresetBehindHigh - \value PresetIsometricLeft - \value PresetIsometricLeftHigh - \value PresetIsometricRight - \value PresetIsometricRightHigh - \value PresetDirectlyAbove - \value PresetDirectlyAboveCW45 - \value PresetDirectlyAboveCCW45 - \value PresetFrontBelow - In Q3DBars from PresetFrontBelow onward these only work for graphs including negative + \value CameraPresetFrontLow + \value CameraPresetFront + \value CameraPresetFrontHigh + \value CameraPresetLeftLow + \value CameraPresetLeft + \value CameraPresetLeftHigh + \value CameraPresetRightLow + \value CameraPresetRight + \value CameraPresetRightHigh + \value CameraPresetBehindLow + \value CameraPresetBehind + \value CameraPresetBehindHigh + \value CameraPresetIsometricLeft + \value CameraPresetIsometricLeftHigh + \value CameraPresetIsometricRight + \value CameraPresetIsometricRightHigh + \value CameraPresetDirectlyAbove + \value CameraPresetDirectlyAboveCW45 + \value CameraPresetDirectlyAboveCCW45 + \value CameraPresetFrontBelow + In Q3DBars from CameraPresetFrontBelow onward these only work for graphs including negative values. They act as Preset...Low for positive-only values. - \value PresetLeftBelow - \value PresetRightBelow - \value PresetBehindBelow - \value PresetDirectlyBelow - Acts as PresetFrontLow for positive -only bars. + \value CameraPresetLeftBelow + \value CameraPresetRightBelow + \value CameraPresetBehindBelow + \value CameraPresetDirectlyBelow + Acts as CameraPresetFrontLow for positive -only bars. */ /*! diff --git a/src/datavisualization/utils/camerahelper.cpp b/src/datavisualization/utils/camerahelper.cpp index 01de3f80..29ed4d57 100644 --- a/src/datavisualization/utils/camerahelper.cpp +++ b/src/datavisualization/utils/camerahelper.cpp @@ -158,123 +158,123 @@ QPointF CameraHelper::getCameraRotations() void CameraHelper::setCameraPreset(QDataVis::CameraPreset preset) { switch (preset) { - case QDataVis::PresetFrontLow: { - qDebug("PresetFrontLow"); + case QDataVis::CameraPresetFrontLow: { + qDebug("CameraPresetFrontLow"); CameraHelper::setCameraRotation(QPointF(0.0f, 0.0f)); break; } - case QDataVis::PresetFront: { - qDebug("PresetFront"); + case QDataVis::CameraPresetFront: { + qDebug("CameraPresetFront"); CameraHelper::setCameraRotation(QPointF(0.0f, 22.5f)); break; } - case QDataVis::PresetFrontHigh: { - qDebug("PresetFrontHigh"); + case QDataVis::CameraPresetFrontHigh: { + qDebug("CameraPresetFrontHigh"); CameraHelper::setCameraRotation(QPointF(0.0f, 45.0f)); break; } - case QDataVis::PresetLeftLow: { - qDebug("PresetLeftLow"); + case QDataVis::CameraPresetLeftLow: { + qDebug("CameraPresetLeftLow"); CameraHelper::setCameraRotation(QPointF(90.0f, 0.0f)); break; } - case QDataVis::PresetLeft: { - qDebug("PresetLeft"); + case QDataVis::CameraPresetLeft: { + qDebug("CameraPresetLeft"); CameraHelper::setCameraRotation(QPointF(90.0f, 22.5f)); break; } - case QDataVis::PresetLeftHigh: { - qDebug("PresetLeftHigh"); + case QDataVis::CameraPresetLeftHigh: { + qDebug("CameraPresetLeftHigh"); CameraHelper::setCameraRotation(QPointF(90.0f, 45.0f)); break; } - case QDataVis::PresetRightLow: { - qDebug("PresetRightLow"); + case QDataVis::CameraPresetRightLow: { + qDebug("CameraPresetRightLow"); CameraHelper::setCameraRotation(QPointF(-90.0f, 0.0f)); break; } - case QDataVis::PresetRight: { - qDebug("PresetRight"); + case QDataVis::CameraPresetRight: { + qDebug("CameraPresetRight"); CameraHelper::setCameraRotation(QPointF(-90.0f, 22.5f)); break; } - case QDataVis::PresetRightHigh: { - qDebug("PresetRightHigh"); + case QDataVis::CameraPresetRightHigh: { + qDebug("CameraPresetRightHigh"); CameraHelper::setCameraRotation(QPointF(-90.0f, 45.0f)); break; } - case QDataVis::PresetBehindLow: { - qDebug("PresetBehindLow"); + case QDataVis::CameraPresetBehindLow: { + qDebug("CameraPresetBehindLow"); CameraHelper::setCameraRotation(QPointF(180.0f, 0.0f)); break; } - case QDataVis::PresetBehind: { - qDebug("PresetBehind"); + case QDataVis::CameraPresetBehind: { + qDebug("CameraPresetBehind"); CameraHelper::setCameraRotation(QPointF(180.0f, 22.5f)); break; } - case QDataVis::PresetBehindHigh: { - qDebug("PresetBehindHigh"); + case QDataVis::CameraPresetBehindHigh: { + qDebug("CameraPresetBehindHigh"); CameraHelper::setCameraRotation(QPointF(180.0f, 45.0f)); break; } - case QDataVis::PresetIsometricLeft: { - qDebug("PresetIsometricLeft"); + case QDataVis::CameraPresetIsometricLeft: { + qDebug("CameraPresetIsometricLeft"); CameraHelper::setCameraRotation(QPointF(45.0f, 22.5f)); break; } - case QDataVis::PresetIsometricLeftHigh: { - qDebug("PresetIsometricLeftHigh"); + case QDataVis::CameraPresetIsometricLeftHigh: { + qDebug("CameraPresetIsometricLeftHigh"); CameraHelper::setCameraRotation(QPointF(45.0f, 45.0f)); break; } - case QDataVis::PresetIsometricRight: { - qDebug("PresetIsometricRight"); + case QDataVis::CameraPresetIsometricRight: { + qDebug("CameraPresetIsometricRight"); CameraHelper::setCameraRotation(QPointF(-45.0f, 22.5f)); break; } - case QDataVis::PresetIsometricRightHigh: { - qDebug("PresetIsometricRightHigh"); + case QDataVis::CameraPresetIsometricRightHigh: { + qDebug("CameraPresetIsometricRightHigh"); CameraHelper::setCameraRotation(QPointF(-45.0f, 45.0f)); break; } - case QDataVis::PresetDirectlyAbove: { - qDebug("PresetDirectlyAbove"); + case QDataVis::CameraPresetDirectlyAbove: { + qDebug("CameraPresetDirectlyAbove"); CameraHelper::setCameraRotation(QPointF(0.0f, 90.0f)); break; } - case QDataVis::PresetDirectlyAboveCW45: { - qDebug("PresetDirectlyAboveCW45"); + case QDataVis::CameraPresetDirectlyAboveCW45: { + qDebug("CameraPresetDirectlyAboveCW45"); CameraHelper::setCameraRotation(QPointF(-45.0f, 90.0f)); break; } - case QDataVis::PresetDirectlyAboveCCW45: { - qDebug("PresetDirectlyAboveCCW45"); + case QDataVis::CameraPresetDirectlyAboveCCW45: { + qDebug("CameraPresetDirectlyAboveCCW45"); CameraHelper::setCameraRotation(QPointF(45.0f, 90.0f)); break; } - case QDataVis::PresetFrontBelow: { - qDebug("PresetFrontBelow"); + case QDataVis::CameraPresetFrontBelow: { + qDebug("CameraPresetFrontBelow"); CameraHelper::setCameraRotation(QPointF(0.0f, -45.0f)); break; } - case QDataVis::PresetLeftBelow: { - qDebug("PresetLeftBelow"); + case QDataVis::CameraPresetLeftBelow: { + qDebug("CameraPresetLeftBelow"); CameraHelper::setCameraRotation(QPointF(90.0f, -45.0f)); break; } - case QDataVis::PresetRightBelow: { - qDebug("PresetRightBelow"); + case QDataVis::CameraPresetRightBelow: { + qDebug("CameraPresetRightBelow"); CameraHelper::setCameraRotation(QPointF(-90.0f, -45.0f)); break; } - case QDataVis::PresetBehindBelow: { - qDebug("PresetBehindBelow"); + case QDataVis::CameraPresetBehindBelow: { + qDebug("CameraPresetBehindBelow"); CameraHelper::setCameraRotation(QPointF(180.0f, -45.0f)); break; } - case QDataVis::PresetDirectlyBelow: { - qDebug("PresetDirectlyBelow"); + case QDataVis::CameraPresetDirectlyBelow: { + qDebug("CameraPresetDirectlyBelow"); CameraHelper::setCameraRotation(QPointF(0.0f, -90.0f)); break; } diff --git a/tests/barstest/chart.cpp b/tests/barstest/chart.cpp index fa1d55e4..b58980a2 100644 --- a/tests/barstest/chart.cpp +++ b/tests/barstest/chart.cpp @@ -443,12 +443,12 @@ void ChartModifier::changeStyle() void ChartModifier::changePresetCamera() { - static int preset = QDataVis::PresetFrontLow; + static int preset = QDataVis::CameraPresetFrontLow; m_chart->setCameraPreset((QDataVis::CameraPreset)preset); - if (++preset > QDataVis::PresetDirectlyBelow) - preset = QDataVis::PresetFrontLow; + if (++preset > QDataVis::CameraPresetDirectlyBelow) + preset = QDataVis::CameraPresetFrontLow; } void ChartModifier::changeTheme() diff --git a/tests/scattertest/scatterchart.cpp b/tests/scattertest/scatterchart.cpp index a0b56753..04e8db67 100644 --- a/tests/scattertest/scatterchart.cpp +++ b/tests/scattertest/scatterchart.cpp @@ -37,7 +37,7 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter) m_chart->setObjectType(QDataVis::Spheres, true); m_chart->setTheme(QDataVis::ThemeStoneMoss); m_chart->setShadowQuality(QDataVis::ShadowQualityHigh); - m_chart->setCameraPreset(QDataVis::PresetFront); + m_chart->setCameraPreset(QDataVis::CameraPresetFront); m_chart->setAxisX(new Q3DValueAxis); m_chart->setAxisY(new Q3DValueAxis); m_chart->setAxisZ(new Q3DValueAxis); @@ -115,12 +115,12 @@ void ScatterDataModifier::changeStyle() void ScatterDataModifier::changePresetCamera() { - static int preset = QDataVis::PresetFrontLow; + static int preset = QDataVis::CameraPresetFrontLow; m_chart->setCameraPreset((QDataVis::CameraPreset)preset); - if (++preset > QDataVis::PresetDirectlyAboveCCW45) - preset = QDataVis::PresetFrontLow; + if (++preset > QDataVis::CameraPresetDirectlyAboveCCW45) + preset = QDataVis::CameraPresetFrontLow; } void ScatterDataModifier::changeTheme() |