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, 31 insertions, 8 deletions

diff --git a/src/datavisualization/data/qabstract3dseries.h b/src/datavisualization/data/qabstract3dseries.h
index f5dfcf09..ebe73510 100644
--- a/src/datavisualization/data/qabstract3dseries.h
+++ b/src/datavisualization/data/qabstract3dseries.h
@@ -20,8 +20,10 @@
 #define QABSTRACT3DSERIES_H
 
 #include <QtDataVisualization/qdatavisualizationenums.h>
+#include <QtDataVisualization/q3dtheme.h>
 #include <QObject>
 #include <QScopedPointer>
+#include <QLinearGradient>
 
 QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
@@ -38,6 +40,13 @@ class QT_DATAVISUALIZATION_EXPORT QAbstract3DSeries : public QObject
     Q_PROPERTY(Mesh mesh READ mesh WRITE setMesh NOTIFY meshChanged)
     Q_PROPERTY(bool meshSmooth READ isMeshSmooth WRITE setMeshSmooth NOTIFY meshSmoothChanged)
     Q_PROPERTY(QString userDefinedMesh READ userDefinedMesh WRITE setUserDefinedMesh NOTIFY userDefinedMeshChanged)
+    Q_PROPERTY(QtDataVisualization::Q3DTheme::ColorStyle colorStyle READ colorStyle WRITE setColorStyle NOTIFY colorStyleChanged)
+    Q_PROPERTY(QColor baseColor READ baseColor WRITE setBaseColor NOTIFY baseColorChanged)
+    Q_PROPERTY(QLinearGradient baseGradient READ baseGradient WRITE setBaseGradient NOTIFY baseGradientChanged)
+    Q_PROPERTY(QColor singleHighlightColor READ singleHighlightColor WRITE setSingleHighlightColor NOTIFY singleHighlightColorChanged)
+    Q_PROPERTY(QLinearGradient singleHighlightGradient READ singleHighlightGradient WRITE setSingleHighlightGradient NOTIFY singleHighlightGradientChanged)
+    Q_PROPERTY(QColor multiHighlightColor READ multiHighlightColor WRITE setMultiHighlightColor NOTIFY multiHighlightColorChanged)
+    Q_PROPERTY(QLinearGradient multiHighlightGradient READ multiHighlightGradient WRITE setMultiHighlightGradient NOTIFY multiHighlightGradientChanged)
 
 public:
     enum SeriesType {
@@ -84,24 +93,38 @@ public:
     void setUserDefinedMesh(const QString &fileName);
     QString userDefinedMesh() const;
 
+    void setColorStyle(Q3DTheme::ColorStyle style);
+    Q3DTheme::ColorStyle colorStyle() const;
+    void setBaseColor(const QColor &color);
+    QColor baseColor() const;
+    void setBaseGradient(const QLinearGradient &gradient);
+    QLinearGradient baseGradient() const;
+    void setSingleHighlightColor(const QColor &color);
+    QColor singleHighlightColor() const;
+    void setSingleHighlightGradient(const QLinearGradient &gradient);
+    QLinearGradient singleHighlightGradient() const;
+    void setMultiHighlightColor(const QColor &color);
+    QColor multiHighlightColor() const;
+    void setMultiHighlightGradient(const QLinearGradient &gradient);
+    QLinearGradient multiHighlightGradient() const;
+
 signals:
     void itemLabelFormatChanged(QString format);
     void visibilityChanged(bool visible);
     void meshChanged(Mesh mesh);
     void meshSmoothChanged(bool enabled);
     void userDefinedMeshChanged(QString fileName);
+    void colorStyleChanged(Q3DTheme::ColorStyle style);
+    void baseColorChanged(QColor color);
+    void baseGradientChanged(QLinearGradient gradient);
+    void singleHighlightColorChanged(QColor color);
+    void singleHighlightGradientChanged(QLinearGradient gradient);
+    void multiHighlightColorChanged(QColor color);
+    void multiHighlightGradientChanged(QLinearGradient gradient);
 
 protected:
     QScopedPointer<QAbstract3DSeriesPrivate> d_ptr;
 
-//    Q3DTheme::ColorStyle m_colorStyle;
-//    QColor m_objectColor;
-//    QLinearGradient m_objectGradient;
-//    QColor m_singleHighlightColor;
-//    QLinearGradient m_singleHighlightGradient;
-//    QColor m_multiHighlightColor;
-//    QLinearGradient m_multiHighlightGradient;
-
 private:
     Q_DISABLE_COPY(QAbstract3DSeries)