Added Camera QML API and Example

Change-Id: Ibc790ac6c720b6d22d68f662ff2f50e74a9abaae
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

6 files changed, 19 insertions, 9 deletions

diff --git a/examples/audiolevels/audiolevels.cpp b/examples/audiolevels/audiolevels.cpp
index 0d227a31..5171492f 100644
--- a/examples/audiolevels/audiolevels.cpp
+++ b/examples/audiolevels/audiolevels.cpp
@@ -21,6 +21,8 @@
 
 #include <QtDataVisualization/qbardataproxy.h>
 #include <QtDataVisualization/q3dvalueaxis.h>
+#include <QtDataVisualization/q3dscene.h>
+#include <QtDataVisualization/q3dcamera.h>
 
 #include <QAudioDeviceInfo>
 #include <QAudioInput>
@@ -42,7 +44,7 @@ AudioLevels::AudioLevels(Q3DBars *graph, QObject *parent)
     m_graph->setBackgroundVisible(false);
     m_graph->valueAxis()->setRange(0.0, 1.0);
     m_graph->setShadowQuality(QDataVis::ShadowQualityNone);
-    m_graph->setCameraPosition(-20.0, 10.0, 10);
+    m_graph->scene()->activeCamera()->setCameraPosition(-20.0, 10.0, 10);
     m_graph->setTheme(QDataVis::ThemeIsabelle);
 
     QAudioFormat formatAudio;
diff --git a/examples/bars/main.cpp b/examples/bars/main.cpp
index e3ec17c5..6ab685ed 100644
--- a/examples/bars/main.cpp
+++ b/examples/bars/main.cpp
@@ -20,6 +20,8 @@
 #include <QtDataVisualization/q3dcategoryaxis.h>
 #include <QtDataVisualization/qitemmodelbardataproxy.h>
 #include <QtDataVisualization/q3dvalueaxis.h>
+#include <QtDataVisualization/q3dscene.h>
+#include <QtDataVisualization/q3dcamera.h>
 
 #include <QApplication>
 #include <QVBoxLayout>
@@ -113,7 +115,7 @@ GraphDataGenerator::GraphDataGenerator(Q3DBars *bargraph, QTableWidget *tableWid
     m_graph->setTheme(QDataVis::ThemeDigia);
 
     // Set preset camera position
-    m_graph->setCameraPreset(QDataVis::CameraPresetFront);
+    m_graph->scene()->activeCamera()->setCameraPreset(QDataVis::CameraPresetFront);
     //! [7]
 }
 
diff --git a/examples/qmlbars/qml/qmlbars/main.qml b/examples/qmlbars/qml/qmlbars/main.qml
index aec3188c..d349ef97 100644
--- a/examples/qmlbars/qml/qmlbars/main.qml
+++ b/examples/qmlbars/qml/qmlbars/main.qml
@@ -54,7 +54,7 @@ Item {
             barThickness: 0.5
             barSpacing: Qt.size(0.5, 0.5)
             barSpacingRelative: false
-            cameraPreset: Bars3D.CameraPresetRight
+            scene.activeCamera.cameraPreset: Bars3D.CameraPresetRight
             columnAxis: graphAxes.column
             valueAxis: graphAxes.expenses
             itemLabelFormat: "@valueTitle for @colLabel, @rowLabel: @valueLabel"
diff --git a/examples/rainfall/rainfallgraph.cpp b/examples/rainfall/rainfallgraph.cpp
index 5cd70710..41f72464 100644
--- a/examples/rainfall/rainfallgraph.cpp
+++ b/examples/rainfall/rainfallgraph.cpp
@@ -19,6 +19,8 @@
 #include "rainfallgraph.h"
 #include <QtDataVisualization/q3dcategoryaxis.h>
 #include <QtDataVisualization/q3dvalueaxis.h>
+#include <QtDataVisualization/q3dscene.h>
+#include <QtDataVisualization/q3dcamera.h>
 #include <QGuiApplication>
 #include <QFont>
 #include <QDebug>
@@ -72,7 +74,7 @@ RainfallGraph::RainfallGraph(Q3DBars *rainfall)
     m_graph->setTheme(QDataVis::ThemeArmyBlue);
 
     // Set preset camera position
-    m_graph->setCameraPreset(QDataVis::CameraPresetIsometricRightHigh);
+    m_graph->scene()->activeCamera()->setCameraPreset(QDataVis::CameraPresetIsometricRightHigh);
 
     // Disable grid
     m_graph->setGridVisible(false);
diff --git a/examples/scatter/scatterdatamodifier.cpp b/examples/scatter/scatterdatamodifier.cpp
index cf3296bb..d9fc5bc3 100644
--- a/examples/scatter/scatterdatamodifier.cpp
+++ b/examples/scatter/scatterdatamodifier.cpp
@@ -19,6 +19,8 @@
 #include "scatterdatamodifier.h"
 #include <QtDataVisualization/qscatterdataproxy.h>
 #include <QtDataVisualization/q3dvalueaxis.h>
+#include <QtDataVisualization/q3dscene.h>
+#include <QtDataVisualization/q3dcamera.h>
 #include <qmath.h>
 using namespace QtDataVisualization;
 
@@ -38,7 +40,7 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter)
     m_graph->setObjectType(QDataVis::MeshStyleSpheres, true);
     m_graph->setTheme(QDataVis::ThemeEbony);
     m_graph->setShadowQuality(QDataVis::ShadowQualityHigh);
-    m_graph->setCameraPreset(QDataVis::CameraPresetFront);
+    m_graph->scene()->activeCamera()->setCameraPreset(QDataVis::CameraPresetFront);
     m_graph->setAxisX(new Q3DValueAxis);
     m_graph->setAxisY(new Q3DValueAxis);
     m_graph->setAxisZ(new Q3DValueAxis);
@@ -113,7 +115,7 @@ void ScatterDataModifier::changePresetCamera()
 {
     static int preset = QDataVis::CameraPresetFrontLow;
 
-    m_graph->setCameraPreset((QDataVis::CameraPreset)preset);
+    m_graph->scene()->activeCamera()->setCameraPreset((QDataVis::CameraPreset)preset);
 
     if (++preset > QDataVis::CameraPresetDirectlyAboveCCW45)
         preset = QDataVis::CameraPresetFrontLow;
diff --git a/examples/widget/graphmodifier.cpp b/examples/widget/graphmodifier.cpp
index 7da3000b..c5b8be4a 100644
--- a/examples/widget/graphmodifier.cpp
+++ b/examples/widget/graphmodifier.cpp
@@ -20,6 +20,8 @@
 #include <QtDataVisualization/q3dcategoryaxis.h>
 #include <QtDataVisualization/q3dvalueaxis.h>
 #include <QtDataVisualization/qbardataproxy.h>
+#include <QtDataVisualization/q3dscene.h>
+#include <QtDataVisualization/q3dcamera.h>
 #include <QTime>
 
 QT_DATAVISUALIZATION_USE_NAMESPACE
@@ -134,7 +136,7 @@ void GraphModifier::changePresetCamera()
 {
     static int preset = QDataVis::CameraPresetFrontLow;
 
-    m_graph->setCameraPreset((QDataVis::CameraPreset)preset);
+    m_graph->scene()->activeCamera()->setCameraPreset((QDataVis::CameraPreset)preset);
 
     if (++preset > QDataVis::CameraPresetDirectlyBelow)
         preset = QDataVis::CameraPresetFrontLow;
@@ -192,13 +194,13 @@ void GraphModifier::changeShadowQuality(int quality)
 void GraphModifier::rotateX(int rotation)
 {
     m_xRotation = rotation;
-    m_graph->setCameraPosition(m_xRotation, m_yRotation);
+    m_graph->scene()->activeCamera()->setCameraPosition(m_xRotation, m_yRotation);
 }
 
 void GraphModifier::rotateY(int rotation)
 {
     m_yRotation = rotation;
-    m_graph->setCameraPosition(m_xRotation, m_yRotation);
+    m_graph->scene()->activeCamera()->setCameraPosition(m_xRotation, m_yRotation);
 }
 
 void GraphModifier::setBackgroundEnabled(int enabled)