diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-08-15 14:19:26 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-08-15 14:37:57 +0300 |
| commit | 498d4f391932ab612afa2a1ce5ced8c6aea44942 (patch) | |
| tree | 1885b03ac9a8f0d03593570adda1aa7f097aca4b /src | |
| parent | a29903b682fa5862fd5c6ffdded14a6c06c4cfe8 (diff) | |
Bring drawer initialization to axis caches back
Change-Id: I161b5937bba3a0652cb5791af0e202edcba14458
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/datavis3d/engine/abstract3drenderer.cpp | 20 | ||||
| -rw-r--r-- | src/datavis3d/engine/abstract3drenderer_p.h | 1 |
2 files changed, 3 insertions, 18 deletions
diff --git a/src/datavis3d/engine/abstract3drenderer.cpp b/src/datavis3d/engine/abstract3drenderer.cpp index ffd30990..ca97abad 100644 --- a/src/datavis3d/engine/abstract3drenderer.cpp +++ b/src/datavis3d/engine/abstract3drenderer.cpp @@ -34,6 +34,9 @@ Abstract3DRenderer::Abstract3DRenderer(Abstract3DController *controller) void Abstract3DRenderer::initializeOpenGL() { + axisCacheForOrientation(QAbstractAxis::AxisOrientationX).setDrawer(m_drawer); + axisCacheForOrientation(QAbstractAxis::AxisOrientationY).setDrawer(m_drawer); + axisCacheForOrientation(QAbstractAxis::AxisOrientationZ).setDrawer(m_drawer); } void Abstract3DRenderer::updateDataModel(QAbstractDataProxy *dataProxy) @@ -190,23 +193,6 @@ void Abstract3DRenderer::updateAxisSubSegmentCount(QAbstractAxis::AxisOrientatio axisCacheForOrientation(orientation).setSubSegmentCount(count); } -void Abstract3DRenderer::initializeAxisCache(QAbstractAxis::AxisOrientation orientation, const QAbstractAxis *axis) -{ - axisCacheForOrientation(orientation).setDrawer(m_drawer); - - if (axis) { - updateAxisType(orientation, axis->type()); - updateAxisTitle(orientation, axis->title()); - updateAxisLabels(orientation, axis->labels()); - if (axis->type() & QAbstractAxis::AxisTypeValue) { - const QValueAxis *valueAxis = static_cast<const QValueAxis *>(axis); - updateAxisRange(orientation, valueAxis->min(), valueAxis->max()); - updateAxisSegmentCount(orientation, valueAxis->segmentCount()); - updateAxisSubSegmentCount(orientation, valueAxis->subSegmentCount()); - } - } -} - AxisRenderCache &Abstract3DRenderer::axisCacheForOrientation(QAbstractAxis::AxisOrientation orientation) { switch (orientation) { diff --git a/src/datavis3d/engine/abstract3drenderer_p.h b/src/datavis3d/engine/abstract3drenderer_p.h index 0ba14c63..6f13ac2f 100644 --- a/src/datavis3d/engine/abstract3drenderer_p.h +++ b/src/datavis3d/engine/abstract3drenderer_p.h @@ -100,7 +100,6 @@ public: virtual void updateAxisSegmentCount(QAbstractAxis::AxisOrientation orientation, int count); virtual void updateAxisSubSegmentCount(QAbstractAxis::AxisOrientation orientation, int count); - void initializeAxisCache(QAbstractAxis::AxisOrientation orientation, const QAbstractAxis *axis); AxisRenderCache &axisCacheForOrientation(QAbstractAxis::AxisOrientation orientation); public: |