Removed the unused renderer pointer from render items

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

6 files changed, 2 insertions, 23 deletions

diff --git a/src/datavis3d/data/barrenderitem.cpp b/src/datavis3d/data/barrenderitem.cpp
index c004ed22..3240d19d 100644
--- a/src/datavis3d/data/barrenderitem.cpp
+++ b/src/datavis3d/data/barrenderitem.cpp
@@ -23,7 +23,6 @@ QT_DATAVIS3D_BEGIN_NAMESPACE
 
 BarRenderItem::BarRenderItem()
     : AbstractRenderItem(),
-      m_renderer(0),
       m_value(0),
       m_height(0.0f),
       m_sliceLabelItem(0)
@@ -33,7 +32,6 @@ BarRenderItem::BarRenderItem()
 BarRenderItem::BarRenderItem(const BarRenderItem &other)
     : AbstractRenderItem(other)
 {
-    m_renderer = other.m_renderer;
     m_value = other.m_value;
     m_position = other.m_position;
     m_height = other.m_height;
diff --git a/src/datavis3d/data/barrenderitem_p.h b/src/datavis3d/data/barrenderitem_p.h
index e35cef08..b1331b18 100644
--- a/src/datavis3d/data/barrenderitem_p.h
+++ b/src/datavis3d/data/barrenderitem_p.h
@@ -61,11 +61,7 @@ public:
     void setSliceLabel(const QString &label);
     QString &sliceLabel(); // Formats label if not previously formatted
 
-    // TODO should be in abstract, but currently there is no abstract renderer
-    inline void setRenderer(Bars3DRenderer *renderer) { m_renderer = renderer; }
-
 protected:
-    Bars3DRenderer *m_renderer;
     qreal m_value;
     QPoint m_position; // x = row, y = column
     GLfloat m_height;
diff --git a/src/datavis3d/data/scatterrenderitem.cpp b/src/datavis3d/data/scatterrenderitem.cpp
index 4e6fbe9b..4a6fdfd7 100644
--- a/src/datavis3d/data/scatterrenderitem.cpp
+++ b/src/datavis3d/data/scatterrenderitem.cpp
@@ -23,15 +23,13 @@
 QT_DATAVIS3D_BEGIN_NAMESPACE
 
 ScatterRenderItem::ScatterRenderItem()
-    : AbstractRenderItem(),
-    m_renderer(0)
+    : AbstractRenderItem()
 {
 }
 
 ScatterRenderItem::ScatterRenderItem(const ScatterRenderItem &other)
     : AbstractRenderItem(other)
 {
-    m_renderer = other.m_renderer;
     m_position = other.m_position;
 }
 
diff --git a/src/datavis3d/data/scatterrenderitem_p.h b/src/datavis3d/data/scatterrenderitem_p.h
index cf63ae50..dd708f59 100644
--- a/src/datavis3d/data/scatterrenderitem_p.h
+++ b/src/datavis3d/data/scatterrenderitem_p.h
@@ -48,11 +48,7 @@ public:
     //inline void setSize(qreal size);
     //inline qreal size() const { return m_size; }
 
-    // TODO should be in abstract, but currently there is no abstract renderer
-    inline void setRenderer(Scatter3DRenderer *renderer) { m_renderer = renderer; }
-
 protected:
-    Scatter3DRenderer *m_renderer;
     QVector3D m_position;
     //qreal m_size; // TODO in case we need a fourth variable that adjusts scatter item size
 
diff --git a/src/datavis3d/engine/bars3drenderer.cpp b/src/datavis3d/engine/bars3drenderer.cpp
index 6520dc8a..0dd182c4 100644
--- a/src/datavis3d/engine/bars3drenderer.cpp
+++ b/src/datavis3d/engine/bars3drenderer.cpp
@@ -88,8 +88,6 @@ Bars3DRenderer::Bars3DRenderer(Bars3DController *controller)
       m_previousSelection(selectionSkipColor),
       m_hasHeightAdjustmentChanged(true)
 {
-    m_dummyBarRenderItem.setRenderer(this);
-
     initializeOpenGLFunctions();
     initializeOpenGL();
 }
@@ -1480,11 +1478,8 @@ void Bars3DRenderer::updateSampleSpace(int rowCount, int columnCount)
     // TODO is there a way to allocate the whole array with one allocation?
     m_renderItemArray.clear();
     m_renderItemArray.resize(rowCount);
-    for (int i = 0; i < rowCount; i++) {
+    for (int i = 0; i < rowCount; i++)
         m_renderItemArray[i].resize(columnCount);
-        for (int j = 0; j < columnCount; j++)
-            m_renderItemArray[i][j].setRenderer(this);
-    }
 
     // Force update for selection related items
     m_sliceCache = 0;
diff --git a/src/datavis3d/engine/scatter3drenderer.cpp b/src/datavis3d/engine/scatter3drenderer.cpp
index ee5a6cf2..7849a75f 100644
--- a/src/datavis3d/engine/scatter3drenderer.cpp
+++ b/src/datavis3d/engine/scatter3drenderer.cpp
@@ -82,9 +82,6 @@ Scatter3DRenderer::Scatter3DRenderer(Scatter3DController *controller)
       m_dotSizeScale(1.0f),
       m_hasHeightAdjustmentChanged(true)
 {
-    //qDebug() << __FUNCTION__;
-    m_dummyRenderItem.setRenderer(this);
-
     initializeOpenGLFunctions();
     initializeOpenGL();
 }
@@ -152,7 +149,6 @@ void Scatter3DRenderer::updateDataModel(QScatterDataProxy *dataProxy)
                 && (dotPos.z() >= m_axisCacheZ.min() && dotPos.z() <= m_axisCacheZ.max())) {
             m_renderItemArray[actualDataSize].setPosition(dotPos);
             calculateTranslation(m_renderItemArray[actualDataSize]);
-            m_renderItemArray[actualDataSize].setRenderer(this);
             actualDataSize++;
         }
     }