Improved the ownership handling of data proxies and axes.

Task-number: QTRD-2212

Change-Id: Ie55e5c2765e28f1b31915f12eb952dbb5260047f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

1 files changed, 10 insertions, 0 deletions

diff --git a/src/datavis3d/engine/abstract3dcontroller_p.h b/src/datavis3d/engine/abstract3dcontroller_p.h
index 3123a5d7..81775f9d 100644
--- a/src/datavis3d/engine/abstract3dcontroller_p.h
+++ b/src/datavis3d/engine/abstract3dcontroller_p.h
@@ -36,6 +36,7 @@
 #include "qabstractaxis.h"
 #include "drawer_p.h"
 #include "qabstract3dinputhandler.h"
+#include "qabstractdataproxy.h"
 
 class QFont;
 
@@ -165,6 +166,9 @@ protected:
     Abstract3DRenderer *m_renderer;
     bool m_isDataDirty;
 
+    QAbstractDataProxy *m_data;
+    QList<QAbstractDataProxy *> m_dataProxies;
+
     explicit Abstract3DController(QRect boundRect, QObject *parent = 0);
     ~Abstract3DController();
 
@@ -208,6 +212,12 @@ public:
     virtual void releaseAxis(QAbstractAxis *axis);
     virtual QList<QAbstractAxis *> axes() const; // Omits default axes
 
+    virtual QAbstractDataProxy *activeDataProxy() const;
+    virtual void addDataProxy(QAbstractDataProxy *proxy);
+    virtual void releaseDataProxy(QAbstractDataProxy *proxy);
+    virtual QList<QAbstractDataProxy *> dataProxies() const;
+    virtual void setActiveDataProxy(QAbstractDataProxy *proxy);
+
     virtual int zoomLevel();
     virtual void setZoomLevel(int zoomLevel);