From ec195a34594dea6145af5e8f2fedc2f9401d0f14 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Thu, 19 Jun 2014 09:54:03 +0300
Subject: 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>
---
 .../engine/abstract3dcontroller_p.h                | 26 +++++++++++++---------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'src/datavisualization/engine/abstract3dcontroller_p.h')

diff --git a/src/datavisualization/engine/abstract3dcontroller_p.h b/src/datavisualization/engine/abstract3dcontroller_p.h
index 0e4d1add..7d721b0c 100644
--- a/src/datavisualization/engine/abstract3dcontroller_p.h
+++ b/src/datavisualization/engine/abstract3dcontroller_p.h
@@ -90,6 +90,7 @@ struct Abstract3DChangeBitField {
     bool axisXTitleFixedChanged        : 1;
     bool axisYTitleFixedChanged        : 1;
     bool axisZTitleFixedChanged        : 1;
+    bool polarChanged                  : 1;
 
     Abstract3DChangeBitField() :
         themeChanged(true),
@@ -133,7 +134,8 @@ struct Abstract3DChangeBitField {
         axisZTitleVisibilityChanged(true),
         axisXTitleFixedChanged(true),
         axisYTitleFixedChanged(true),
-        axisZTitleFixedChanged(true)
+        axisZTitleFixedChanged(true),
+        polarChanged(true)
     {
     }
 };
@@ -175,6 +177,7 @@ protected:
     bool m_isCustomItemDirty;
     bool m_isSeriesVisualsDirty;
     bool m_renderPending;
+    bool m_isPolar;
 
     QList<QAbstract3DSeries *> m_seriesList;
 
@@ -261,6 +264,17 @@ public:
     void setOrthoProjection(bool enable);
     bool isOrthoProjection() const;
 
+    void setMeasureFps(bool enable);
+    inline bool measureFps() const { return m_measureFps; }
+    inline qreal currentFps() const { return m_currentFps; }
+
+    QAbstract3DGraph::ElementType selectedElement() const;
+
+    void setAspectRatio(float ratio);
+    float aspectRatio();
+    void setPolar(bool enable);
+    bool isPolar() const;
+
     void emitNeedRender();
 
     virtual void clearSelection() = 0;
@@ -320,17 +334,8 @@ public slots:
     // Renderer callback handlers
     void handleRequestShadowQuality(QAbstract3DGraph::ShadowQuality quality);
 
-    void setMeasureFps(bool enable);
-    inline bool measureFps() const { return m_measureFps; }
-    inline qreal currentFps() const { return m_currentFps; }
-
-    QAbstract3DGraph::ElementType selectedElement() const;
-
     void updateCustomItem();
 
-    void setAspectRatio(float ratio);
-    float aspectRatio();
-
 signals:
     void shadowQualityChanged(QAbstract3DGraph::ShadowQuality quality);
     void activeInputHandlerChanged(QAbstract3DInputHandler *inputHandler);
@@ -346,6 +351,7 @@ signals:
     void orthoProjectionChanged(bool enabled);
     void aspectRatioChanged(float ratio);
     void optimizationHintsChanged(QAbstract3DGraph::OptimizationHints hints);
+    void polarChanged(bool enabled);
 
 protected:
     virtual QAbstract3DAxis *createDefaultAxis(QAbstract3DAxis::AxisOrientation orientation);
-- 
cgit v1.2.3