Polar graph support, phase one

- Polar property for toggling the polar mode
- Example added. Example docs will be added in another patch once all
  of the functionality the example needs has been implemented.
- Only surface graph supports polar so far. Scatter to be added later.

Change-Id: I54d36f764ac1771ac88f73a5f3a2142f2309f6e8
Reviewed-by: Mika Salmela <mika.salmela@digia.com>

3 files changed, 23 insertions, 0 deletions

diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp
index f7ccbf21..30acc9e4 100644
--- a/src/datavisualizationqml2/abstractdeclarative.cpp
+++ b/src/datavisualizationqml2/abstractdeclarative.cpp
@@ -329,6 +329,8 @@ void AbstractDeclarative::setSharedController(Abstract3DController *controller)
                      &AbstractDeclarative::aspectRatioChanged);
     QObject::connect(m_controller.data(), &Abstract3DController::optimizationHintsChanged, this,
                      &AbstractDeclarative::handleOptimizationHintChange);
+    QObject::connect(m_controller.data(), &Abstract3DController::polarChanged, this,
+                     &AbstractDeclarative::polarChanged);
 }
 
 void AbstractDeclarative::activateOpenGLContext(QQuickWindow *window)
@@ -724,6 +726,16 @@ AbstractDeclarative::OptimizationHints AbstractDeclarative::optimizationHints()
     return OptimizationHints(intmode);
 }
 
+void AbstractDeclarative::setPolar(bool enable)
+{
+    m_controller->setPolar(enable);
+}
+
+bool AbstractDeclarative::isPolar() const
+{
+    return m_controller->isPolar();
+}
+
 void AbstractDeclarative::windowDestroyed(QObject *obj)
 {
     // Remove destroyed window from window lists
diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h
index dfcd9537..cd3d6134 100644
--- a/src/datavisualizationqml2/abstractdeclarative_p.h
+++ b/src/datavisualizationqml2/abstractdeclarative_p.h
@@ -72,6 +72,7 @@ class AbstractDeclarative : public QQuickItem
     Q_PROPERTY(ElementType selectedElement READ selectedElement NOTIFY selectedElementChanged REVISION 1)
     Q_PROPERTY(qreal aspectRatio READ aspectRatio WRITE setAspectRatio NOTIFY aspectRatioChanged REVISION 1)
     Q_PROPERTY(OptimizationHints optimizationHints READ optimizationHints WRITE setOptimizationHints NOTIFY optimizationHintsChanged REVISION 1)
+    Q_PROPERTY(bool polar READ isPolar WRITE setPolar NOTIFY polarChanged REVISION 2)
 
 public:
     enum SelectionFlag {
@@ -193,6 +194,9 @@ public:
     void setOptimizationHints(OptimizationHints hints);
     OptimizationHints optimizationHints() const;
 
+    void setPolar(bool enable);
+    bool isPolar() const;
+
 public slots:
     virtual void handleAxisXChanged(QAbstract3DAxis *axis) = 0;
     virtual void handleAxisYChanged(QAbstract3DAxis *axis) = 0;
@@ -230,6 +234,7 @@ signals:
     Q_REVISION(1) void orthoProjectionChanged(bool enabled);
     Q_REVISION(1) void aspectRatioChanged(qreal ratio);
     Q_REVISION(1) void optimizationHintsChanged(AbstractDeclarative::OptimizationHints hints);
+    Q_REVISION(2) void polarChanged(bool enabled);
 
 private:
     QPointer<Abstract3DController> m_controller;
diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
index 09780dc5..c4c0bc70 100644
--- a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
+++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
@@ -106,6 +106,12 @@ void QtDataVisualizationQml2Plugin::registerTypes(const char *uri)
 
     // New metatypes
     qRegisterMetaType<QAbstract3DGraph::ElementType>("QAbstract3DGraph::ElementType");
+
+    // QtDataVisualization 1.2
+
+    // New revisions
+    qmlRegisterUncreatableType<AbstractDeclarative, 2>(uri, 1, 2, "AbstractGraph3D",
+                                                       QLatin1String("Trying to create uncreatable: AbstractGraph3D."));
 }
 
 QT_END_NAMESPACE_DATAVISUALIZATION