Actually use axis formatter in renderer.

Task-number: QTRD-2787

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

1 files changed, 16 insertions, 13 deletions

diff --git a/src/datavisualization/utils/surfaceobject_p.h b/src/datavisualization/utils/surfaceobject_p.h
index 69cb7e5d..c8f7de95 100644
--- a/src/datavisualization/utils/surfaceobject_p.h
+++ b/src/datavisualization/utils/surfaceobject_p.h
@@ -37,6 +37,9 @@
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
+class Surface3DRenderer;
+class AxisRenderCache;
+
 class SurfaceObject : public AbstractObjectHelper
 {
 public:
@@ -47,21 +50,17 @@ public:
     };
 
 public:
-    SurfaceObject();
+    SurfaceObject(Surface3DRenderer *renderer);
     ~SurfaceObject();
 
-    void setUpData(const QSurfaceDataArray &dataArray, const QRect &space, GLfloat yRange,
-                   GLfloat yMin, bool changeGeometry);
-    void setUpSmoothData(const QSurfaceDataArray &dataArray, const QRect &space, GLfloat yRange,
-                         GLfloat yMin, bool changeGeometry);
-    void updateCoarseRow(const QSurfaceDataArray &dataArray, int rowIndex,
-                         GLfloat yRange, GLfloat yMin);
-    void updateSmoothRow(const QSurfaceDataArray &dataArray, int startRow,
-                         GLfloat yRange, GLfloat yMin);
-    void updateSmoothItem(const QSurfaceDataArray &dataArray, int row,
-                          int column, GLfloat yRange, GLfloat yMin);
-    void updateCoarseItem(const QSurfaceDataArray &dataArray, int row,
-                          int column, GLfloat yRange, GLfloat yMin);
+    void setUpData(const QSurfaceDataArray &dataArray, const QRect &space,
+                   bool changeGeometry, bool flipXZ = false);
+    void setUpSmoothData(const QSurfaceDataArray &dataArray, const QRect &space,
+                         bool changeGeometry, bool flipXZ = false);
+    void updateCoarseRow(const QSurfaceDataArray &dataArray, int rowIndex);
+    void updateSmoothRow(const QSurfaceDataArray &dataArray, int startRow);
+    void updateSmoothItem(const QSurfaceDataArray &dataArray, int row, int column);
+    void updateCoarseItem(const QSurfaceDataArray &dataArray, int row, int column);
     void createSmoothIndices(int x, int y, int endX, int endY);
     void createCoarseIndices(int x, int y, int columns, int rows);
     void createSmoothGridlineIndices(int x, int y, int endX, int endY);
@@ -86,6 +85,10 @@ private:
     GLuint m_gridIndexCount;
     QVector<QVector3D> m_vertices;
     QVector<QVector3D> m_normals;
+    // Caches are not owned
+    AxisRenderCache &m_axisCacheX;
+    AxisRenderCache &m_axisCacheY;
+    AxisRenderCache &m_axisCacheZ;
 };
 
 QT_END_NAMESPACE_DATAVISUALIZATION