diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-08-29 15:51:57 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-08-30 07:52:05 +0300 |
commit | a88922ed813f6f0510fc13c6a5ff999a4e51b4d3 (patch) | |
tree | 918519ba9895e3e30b7e50f89e5c0abe5d9fa0f5 /src/datavis3d/engine/bars3dcontroller_p.h | |
parent | 1f9a6ca62c282658ae1f76a59e521cd99a280ba5 (diff) |
Improved the ownership handling of data proxies and axes.
Task-number: QTRD-2212
Change-Id: Ie55e5c2765e28f1b31915f12eb952dbb5260047f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavis3d/engine/bars3dcontroller_p.h')
-rw-r--r-- | src/datavis3d/engine/bars3dcontroller_p.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/datavis3d/engine/bars3dcontroller_p.h b/src/datavis3d/engine/bars3dcontroller_p.h index bdff63b3..5ee5c214 100644 --- a/src/datavis3d/engine/bars3dcontroller_p.h +++ b/src/datavis3d/engine/bars3dcontroller_p.h @@ -78,7 +78,6 @@ private: // Rendering Bars3dRenderer *m_renderer; - QBarDataProxy *m_data; public: explicit Bars3dController(QRect rect); @@ -129,9 +128,8 @@ public: void mouseMoveEvent(QMouseEvent *event, const QPoint &mousePos); void wheelEvent(QWheelEvent *event); - // Sets the data proxy. Assumes ownership of the data proxy. Deletes old proxy. - void setDataProxy(QBarDataProxy *proxy); - QBarDataProxy *dataProxy(); + virtual void setActiveDataProxy(QAbstractDataProxy *proxy); + virtual void handleAxisAutoAdjustRangeChangedInOrientation(QAbstractAxis::AxisOrientation orientation, bool autoAdjust); static QPoint noSelectionPoint(); |