Qdoc documentation for new scene and input classes.

Change-Id: I5d9680fcf2e49655c1b9bcdf961bbda02bf31968
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

1 files changed, 27 insertions, 17 deletions

diff --git a/src/datavisualization/engine/q3dscene.h b/src/datavisualization/engine/q3dscene.h
index 7a2a6e30..483a24b8 100644
--- a/src/datavisualization/engine/q3dscene.h
+++ b/src/datavisualization/engine/q3dscene.h
@@ -21,6 +21,7 @@
 
 #include <QtDataVisualization/qdatavisualizationenums.h>
 #include <QObject>
+#include <QRect>
 
 QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
@@ -32,6 +33,12 @@ class Q3DScenePrivate;
 class QT_DATAVISUALIZATION_EXPORT Q3DScene : public QObject
 {
     Q_OBJECT
+    Q_PROPERTY(QRect viewport READ viewport WRITE setViewport)
+    Q_PROPERTY(QRect primarySubViewport READ primarySubViewport WRITE setPrimarySubViewport)
+    Q_PROPERTY(QRect secondarySubViewport READ secondarySubViewport WRITE setSecondarySubViewport)
+    Q_PROPERTY(bool slicingActive READ isSlicingActive WRITE setSlicingActive)
+    Q_PROPERTY(Q3DCamera* activeCamera READ activeCamera WRITE setActiveCamera)
+    Q_PROPERTY(Q3DLight* activeLight READ activeLight WRITE setActiveLight)
 
 public:
     Q3DScene(QObject *parent = 0);
@@ -41,38 +48,41 @@ public:
     void setViewport(const QRect &viewport);
     void setViewportSize(int width, int height);
 
-    QRect mainViewport() const;
-    void setMainViewport(const QRect &mainViewport);
-    bool isInputInsideMainView(const QPoint &point);
+    QRect primarySubViewport() const;
+    void setPrimarySubViewport(const QRect &primarySubViewport);
+    bool isPointInPrimarySubView(const QPoint &point);
 
-    QRect sliceViewport() const;
-    void setSliceViewport(const QRect &sliceViewport);
-    bool isInputInsideSliceView(const QPoint &point);
+    QRect secondarySubViewport() const;
+    void setSecondarySubViewport(const QRect &secondarySubViewport);
+    bool isPointInSecondarySubView(const QPoint &point);
 
-    Q3DCamera *camera() const;
-    void setCamera(Q3DCamera *camera);
+    void setSlicingActive(bool isSlicing);
+    bool isSlicingActive() const;
 
-    Q3DLight *light() const;
-    void setLight(Q3DLight *light);
+    Q3DCamera *activeCamera() const;
+    void setActiveCamera(Q3DCamera *camera);
 
-    bool isUnderSideCameraEnabled() const;
-    void setUnderSideCameraEnabled(bool isEnabled);
-
-    void setSlicingActivated(bool isSlicing);
-    bool isSlicingActivated() const;
+    Q3DLight *activeLight() const;
+    void setActiveLight(Q3DLight *light);
 
-    // Calcluate light position based on rotation.
-    // Call after calling calculateViewMatrix to get up-to-date position
     void setLightPositionRelativeToCamera(const QVector3D &relativePosition,
                                           qreal fixedRotation = 0.0,
                                           qreal distanceModifier = 0.0);
 
 private:
+    bool isUnderSideCameraEnabled() const;
+    void setUnderSideCameraEnabled(bool isEnabled);
+
     QScopedPointer<Q3DScenePrivate> d_ptr;
 
     Q_DISABLE_COPY(Q3DScene)
 
+    friend class Q3DScenePrivate;
     friend class Abstract3DRenderer;
+    friend class Bars3DRenderer;
+    friend class Surface3DRenderer;
+    friend class Scatter3DRenderer;
+    friend class Q3DCameraPrivate;
 };
 
 QT_DATAVISUALIZATION_END_NAMESPACE