Move series specific visual elements to series, part 4

Colors to series

- Multiselection labels in bar slices still buggy
- Selection in bars doesn't work correctly if not all
  series have items in that grid

Task-number: QTRD-2557
Change-Id: Icd38428e5337a26b8410476104bb1f1f784cdc7f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

1 files changed, 17 insertions, 2 deletions

diff --git a/src/datavisualization/engine/seriesrendercache_p.h b/src/datavisualization/engine/seriesrendercache_p.h
index 976b69c3..906a6c0d 100644
--- a/src/datavisualization/engine/seriesrendercache_p.h
+++ b/src/datavisualization/engine/seriesrendercache_p.h
@@ -36,6 +36,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class Abstract3DRenderer;
 class ObjectHelper;
+class TextureHelper;
 
 class SeriesRenderCache
 {
@@ -44,6 +45,7 @@ public:
     virtual ~SeriesRenderCache();
 
     void populate(QAbstract3DSeries *series, Abstract3DRenderer *renderer);
+    void cleanup(TextureHelper *texHelper);
 
     // NOTE: Series pointer can only be used to access the series when syncing with controller.
     // It is not guaranteed to be valid while rendering and should only be used as an identifier.
@@ -52,14 +54,27 @@ public:
     inline const QString &itemLabelFormat() const { return m_itemLabelFormat; }
     inline const QAbstract3DSeries::Mesh &mesh() const { return m_mesh; }
     inline ObjectHelper *object() const { return m_object; }
-
-    // TODO: Add other visual elements
+    inline const Q3DTheme::ColorStyle &colorStyle() const { return m_colorStyle; }
+    inline const QVector3D &baseColor() const { return m_baseColor; }
+    inline const GLuint &baseGradientTexture() const { return m_baseGradientTexture; }
+    inline const QVector3D &singleHighlightColor() const { return m_singleHighlightColor; }
+    inline const GLuint &singleHighlightGradientTexture() const { return m_singleHighlightGradientTexture; }
+    inline const QVector3D &multiHighlightColor() const { return m_multiHighlightColor; }
+    inline const GLuint &multiHighlightGradientTexture() const { return m_multiHighlightGradientTexture; }
 
 protected:
     QAbstract3DSeries *m_series;
     QString m_itemLabelFormat;
     ObjectHelper *m_object;
     QAbstract3DSeries::Mesh m_mesh;
+
+    Q3DTheme::ColorStyle m_colorStyle;
+    QVector3D m_baseColor;
+    GLuint m_baseGradientTexture;
+    QVector3D m_singleHighlightColor;
+    GLuint m_singleHighlightGradientTexture;
+    QVector3D m_multiHighlightColor;
+    GLuint m_multiHighlightGradientTexture;
 };
 
 QT_DATAVISUALIZATION_END_NAMESPACE