Basic multiseries support

Task-number: QTRD-2548

Change-Id: Iba324c0e8be56f2b3f8f6c6a992883c134a51a9d
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Reviewed-by: Mika Salmela <mika.salmela@digia.com>

1 files changed, 5 insertions, 7 deletions

diff --git a/src/datavisualization/engine/surface3dcontroller_p.h b/src/datavisualization/engine/surface3dcontroller_p.h
index f9617ad4..09c0ca5b 100644
--- a/src/datavisualization/engine/surface3dcontroller_p.h
+++ b/src/datavisualization/engine/surface3dcontroller_p.h
@@ -37,18 +37,17 @@
 QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class Surface3DRenderer;
+class QSurface3DSeries;
 
 struct Surface3DChangeBitField {
     bool gradientColorChanged     : 1;
     bool smoothStatusChanged      : 1;
-    bool surfaceVisibilityChanged : 1;
     bool surfaceGridChanged       : 1;
     bool selectedPointChanged     : 1;
 
     Surface3DChangeBitField() :
         gradientColorChanged(true),
         smoothStatusChanged(true),
-        surfaceVisibilityChanged(true),
         surfaceGridChanged(true),
         selectedPointChanged(true)
     {
@@ -75,9 +74,6 @@ public:
     void initializeOpenGL();
     virtual void synchDataToRenderer();
 
-    void setSurfaceVisible(bool visible);
-    bool surfaceVisible() const;
-
     void setSmoothSurface(bool enable);
     bool smoothSurface();
 
@@ -94,13 +90,15 @@ public:
     void setSelectedPoint(const QPoint &position);
     QPoint selectedPoint() const;
 
-    virtual void setActiveDataProxy(QAbstractDataProxy *proxy);
-
     virtual void handleAxisAutoAdjustRangeChangedInOrientation(Q3DAbstractAxis::AxisOrientation orientation, bool autoAdjust);
     virtual void handleAxisRangeChangedBySender(QObject *sender);
 
     static QPoint noSelectionPoint();
 
+    virtual void addSeries(QAbstract3DSeries *series);
+    virtual void removeSeries(QAbstract3DSeries *series);
+    virtual QList<QSurface3DSeries *> surfaceSeriesList();
+
 public slots:
     void handleArrayReset();