Implement axis caching to renderer.

Axis properties are passed via signals from controller
to renderer.

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

1 files changed, 1 insertions, 17 deletions

diff --git a/src/datavis3d/engine/bars3dcontroller.cpp b/src/datavis3d/engine/bars3dcontroller.cpp
index ada177f6..c1dc09ef 100644
--- a/src/datavis3d/engine/bars3dcontroller.cpp
+++ b/src/datavis3d/engine/bars3dcontroller.cpp
@@ -98,12 +98,6 @@ void Bars3dController::initializeOpenGL()
         return;
 
     m_renderer = new Bars3dRenderer(this);
-    if (m_axisX)
-        m_axisX->d_ptr->setDrawer(m_renderer->drawer());
-    if (m_axisY)
-        m_axisY->d_ptr->setDrawer(m_renderer->drawer());
-    if (m_axisZ)
-        m_axisZ->d_ptr->setDrawer(m_renderer->drawer());
     m_isInitialized = true;
 }
 
@@ -117,8 +111,7 @@ void Bars3dController::render(const GLuint defaultFboHandle)
     // TODO --> Only if there is no need to store m_dataProxy for later, e.g. for string formatting
     // TODO Also, m_valuesDirty flag setting needs to be under same mutex
     QMutexLocker(m_data->mutex());
-    m_renderer->render(m_data, m_valuesDirty, m_cameraHelper, m_axisX->d_ptr->titleItem(),
-                       m_axisY->d_ptr->titleItem(), m_axisZ->d_ptr->titleItem(), defaultFboHandle);
+    m_renderer->render(m_data, m_valuesDirty, m_cameraHelper, defaultFboHandle);
 
     m_valuesDirty = false;
 
@@ -269,15 +262,6 @@ void Bars3dController::wheelEvent(QWheelEvent *event)
     setZoomLevel(zoomLevel);
 }
 
-// TODO: abstract renderer should have accessor for Drawer instead
-Drawer *Bars3dController::drawer()
-{
-    if (m_renderer)
-        return m_renderer->drawer();
-    else
-        return 0;
-}
-
 void Bars3dController::setDataProxy(QBarDataProxy *proxy)
 {
     delete m_data;