Multiseries support for theme colors and gradients, part 2

Task-number: QTRD-2611

Change-Id: I280f3b7c22a212ed46813bd28c639d255107f9f3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

5 files changed, 210 insertions, 61 deletions

diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
index ceefa91e..8dcdfbcc 100644
--- a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
+++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
@@ -73,8 +73,8 @@ void Datavis3Dqml2Plugin::registerTypes(const char *uri)
 
     qmlRegisterType<ColorGradientStop>(uri, 1, 0, "ColorGradientStop");
     qmlRegisterType<ColorGradient>(uri, 1, 0, "ColorGradient");
-    qmlRegisterType<DeclarativeColor>(uri, 1, 0, "Color");
 
+    qmlRegisterType<DeclarativeColor>(uri, 1, 0, "ThemeColor");
     qmlRegisterType<DeclarativeTheme3D>(uri, 1, 0, "Theme3D");
 
     qmlRegisterType<DeclarativeBar3DSeries>(uri, 1, 0, "Bar3DSeries");
diff --git a/src/datavisualizationqml2/declarativecolor.cpp b/src/datavisualizationqml2/declarativecolor.cpp
index e15edd45..5c1ff8c5 100644
--- a/src/datavisualizationqml2/declarativecolor.cpp
+++ b/src/datavisualizationqml2/declarativecolor.cpp
@@ -23,7 +23,19 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 DeclarativeColor::DeclarativeColor(QObject *parent)
     : QObject(parent)
 {
+}
 
+void DeclarativeColor::setColor(const QColor &color)
+{
+    if (m_color != color) {
+        m_color = color;
+        emit colorChanged(color);
+    }
+}
+
+QColor DeclarativeColor::color() const
+{
+    return m_color;
 }
 
 QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavisualizationqml2/declarativecolor_p.h b/src/datavisualizationqml2/declarativecolor_p.h
index e500f794..755652b4 100644
--- a/src/datavisualizationqml2/declarativecolor_p.h
+++ b/src/datavisualizationqml2/declarativecolor_p.h
@@ -31,17 +31,25 @@
 
 #include "datavisualizationglobal_p.h"
 #include <QColor>
-#include <QQmlListProperty>
 
 QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
-class DeclarativeColor : public QObject, public QColor
+class DeclarativeColor : public QObject
 {
     Q_OBJECT
+    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
 
 public:
     DeclarativeColor(QObject *parent = 0);
 
+    void setColor(const QColor &color);
+    QColor color() const;
+
+signals:
+    void colorChanged(QColor color);
+
+private:
+    QColor m_color;
 };
 
 QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavisualizationqml2/declarativetheme.cpp b/src/datavisualizationqml2/declarativetheme.cpp
index 263fa62e..6c804397 100644
--- a/src/datavisualizationqml2/declarativetheme.cpp
+++ b/src/datavisualizationqml2/declarativetheme.cpp
@@ -22,9 +22,12 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 DeclarativeTheme3D::DeclarativeTheme3D(QObject *parent)
     : Q3DTheme(parent),
+      m_colors(QList<DeclarativeColor *>()),
       m_gradients(QList<ColorGradient *>()),
       m_singleHLGradient(0),
-      m_multiHLGradient(0)
+      m_multiHLGradient(0),
+      m_dummyGradients(false),
+      m_dummyColors(false)
 {
 }
 
@@ -34,8 +37,8 @@ DeclarativeTheme3D::~DeclarativeTheme3D()
 
 QQmlListProperty<QObject> DeclarativeTheme3D::seriesChildren()
 {
-    return QQmlListProperty<QObject>(this, this, &DeclarativeTheme3D::appendSeriesChildren
-                                     , 0, 0, 0);
+    return QQmlListProperty<QObject>(this, this, &DeclarativeTheme3D::appendSeriesChildren,
+                                     0, 0, 0);
 }
 
 void DeclarativeTheme3D::appendSeriesChildren(QQmlListProperty<QObject> *list, QObject *element)
@@ -45,6 +48,44 @@ void DeclarativeTheme3D::appendSeriesChildren(QQmlListProperty<QObject> *list, Q
     // Nothing to do, seriesChildren is there only to enable scoping gradient items in Theme3D item.
 }
 
+void DeclarativeTheme3D::handleBaseColorUpdate()
+{
+    int colorCount = m_colors.size();
+    int changed = 0;
+    // Check which one changed
+    DeclarativeColor *color = qobject_cast<DeclarativeColor *>(QObject::sender());
+    for (int i = 0; i < colorCount; i++) {
+        if (color == m_colors.at(i)) {
+            changed = i;
+            break;
+        }
+    }
+    // Update the changed one from the list
+    QList<QColor> list = Q3DTheme::baseColors();
+    list[changed] = m_colors.at(changed)->color();
+    // Set the changed list
+    Q3DTheme::setBaseColors(list);
+}
+
+void DeclarativeTheme3D::handleBaseGradientUpdate()
+{
+    int gradientCount = m_gradients.size();
+    int changed = 0;
+    // Check which one changed
+    ColorGradient *gradient = qobject_cast<ColorGradient *>(QObject::sender());
+    for (int i = 0; i < gradientCount; i++) {
+        if (gradient == m_gradients.at(i)) {
+            changed = i;
+            break;
+        }
+    }
+    // Update the changed one from the list
+    QList<QLinearGradient> list = Q3DTheme::baseGradients();
+    list[changed] = convertGradient(gradient);
+    // Set the changed list
+    Q3DTheme::setBaseGradients(list);
+}
+
 void DeclarativeTheme3D::handleSingleHLGradientUpdate()
 {
     if (m_singleHLGradient)
@@ -145,70 +186,147 @@ QLinearGradient DeclarativeTheme3D::convertGradient(ColorGradient *gradient)
     return newGradient;
 }
 
-//void DeclarativeTheme3D::addColor(const DeclarativeColor &color)
-//{
-//    QList<QColor> list = Q3DTheme::baseColors();
-//    list.append(color);
-//    Q3DTheme::setBaseColors(list);
-//}
+ColorGradient *DeclarativeTheme3D::convertGradient(const QLinearGradient &gradient)
+{
+    ColorGradient *newGradient = new ColorGradient(this);
+    QGradientStops stops = gradient.stops();
+    ColorGradientStop *qmlstop;
+
+    // Convert stops
+    for (int i = 0; i < stops.size(); i++) {
+        qmlstop = new ColorGradientStop(newGradient);
+        qmlstop->setColor(stops.at(i).second);
+        qmlstop->setPosition(stops.at(i).first);
+        newGradient->m_stops.append(qmlstop);
+    }
+
+    return newGradient;
+}
+
+void DeclarativeTheme3D::addColor(DeclarativeColor *color)
+{
+    clearDummyColors();
+    m_colors.append(color);
+    connect(color, &DeclarativeColor::colorChanged,
+            this, &DeclarativeTheme3D::handleBaseColorUpdate);
+    QList<QColor> list = Q3DTheme::baseColors();
+    list.append(color->color());
+    Q3DTheme::setBaseColors(list);
+}
 
-//QList<DeclarativeColor> DeclarativeTheme3D::colorList() const
-//{
-//    return Q3DTheme::baseColors();
-//}
+QList<DeclarativeColor *> DeclarativeTheme3D::colorList()
+{
+    if (m_colors.isEmpty()) {
+        // Create dummy ThemeColors from theme's gradients
+        m_dummyColors = true;
+        QList<QColor> list = Q3DTheme::baseColors();
+        foreach (QColor item, list) {
+            DeclarativeColor *color = new DeclarativeColor(this);
+            color->setColor(item);
+            m_colors.append(color);
+            connect(color, &DeclarativeColor::colorChanged,
+                    this, &DeclarativeTheme3D::handleBaseColorUpdate);
+        }
+    }
+    return m_colors;
+}
+
+void DeclarativeTheme3D::clearColors()
+{
+    clearDummyColors();
+    foreach (DeclarativeColor *item, m_colors)
+        disconnect(item, 0, this, 0);
+    m_colors.clear();
+    Q3DTheme::setBaseColors(QList<QColor>());
+}
 
-//void DeclarativeTheme3D::clearColors()
-//{
-//    Q3DTheme::setBaseColors(QList<QColor>());
-//}
+void DeclarativeTheme3D::clearDummyColors()
+{
+    if (m_dummyColors) {
+        foreach (DeclarativeColor *item, m_colors)
+            delete item;
+        m_colors.clear();
+        m_dummyColors = false;
+    }
+}
 
 void DeclarativeTheme3D::addGradient(ColorGradient *gradient)
 {
+    clearDummyGradients();
     m_gradients.append(gradient);
+    connect(gradient, &ColorGradient::updated,
+            this, &DeclarativeTheme3D::handleBaseGradientUpdate);
     QList<QLinearGradient> list = Q3DTheme::baseGradients();
     list.append(convertGradient(gradient));
     Q3DTheme::setBaseGradients(list);
 }
 
-QList<ColorGradient *> DeclarativeTheme3D::gradientList() const
+QList<ColorGradient *> DeclarativeTheme3D::gradientList()
 {
+    if (m_gradients.isEmpty()) {
+        // Create dummy ColorGradients from theme's gradients
+        m_dummyGradients = true;
+        QList<QLinearGradient> list = Q3DTheme::baseGradients();
+        foreach (QLinearGradient item, list) {
+            ColorGradient *gradient = convertGradient(item);
+            m_gradients.append(gradient);
+            connect(gradient, &ColorGradient::updated,
+                    this, &DeclarativeTheme3D::handleBaseGradientUpdate);
+        }
+    }
+
     return m_gradients;
 }
 
 void DeclarativeTheme3D::clearGradients()
 {
+    clearDummyGradients();
+    foreach (ColorGradient *item, m_gradients)
+        disconnect(item, 0, this, 0);
     m_gradients.clear();
     Q3DTheme::setBaseGradients(QList<QLinearGradient>());
 }
 
-//QQmlListProperty<DeclarativeColor> DeclarativeTheme3D::baseColors()
-//{
-//    return QQmlListProperty<DeclarativeColor>(this, this,
-//                                    &DeclarativeTheme3D::appendBaseColorsFunc,
-//                                    &DeclarativeTheme3D::countBaseColorsFunc,
-//                                    &DeclarativeTheme3D::atBaseColorsFunc,
-//                                    &DeclarativeTheme3D::clearBaseColorsFunc);
-//}
-
-//void DeclarativeTheme3D::appendBaseColorsFunc(QQmlListProperty<DeclarativeColor> *list, DeclarativeColor *color)
-//{
-//    reinterpret_cast<DeclarativeTheme3D *>(list->data)->addColor(*color);
-//}
-
-//int DeclarativeTheme3D::countBaseColorsFunc(QQmlListProperty<DeclarativeColor> *list)
-//{
-//    return reinterpret_cast<DeclarativeTheme3D *>(list->data)->colorList().size();
-//}
-
-//DeclarativeColor *DeclarativeTheme3D::atBaseColorsFunc(QQmlListProperty<DeclarativeColor> *list, int index)
-//{
-//    return &(reinterpret_cast<DeclarativeTheme3D *>(list->data)->colorList()[index]);
-//}
-
-//void DeclarativeTheme3D::clearBaseColorsFunc(QQmlListProperty<DeclarativeColor> *list)
-//{
-//    reinterpret_cast<DeclarativeTheme3D *>(list->data)->clearGradients();
-//}
+void DeclarativeTheme3D::clearDummyGradients()
+{
+    if (m_dummyGradients) {
+        foreach (ColorGradient *item, m_gradients)
+            delete item;
+        m_gradients.clear();
+        m_dummyGradients = false;
+    }
+}
+
+QQmlListProperty<DeclarativeColor> DeclarativeTheme3D::baseColors()
+{
+    return QQmlListProperty<DeclarativeColor>(this, this,
+                                              &DeclarativeTheme3D::appendBaseColorsFunc,
+                                              &DeclarativeTheme3D::countBaseColorsFunc,
+                                              &DeclarativeTheme3D::atBaseColorsFunc,
+                                              &DeclarativeTheme3D::clearBaseColorsFunc);
+}
+
+void DeclarativeTheme3D::appendBaseColorsFunc(QQmlListProperty<DeclarativeColor> *list,
+                                              DeclarativeColor *color)
+{
+    reinterpret_cast<DeclarativeTheme3D *>(list->data)->addColor(color);
+}
+
+int DeclarativeTheme3D::countBaseColorsFunc(QQmlListProperty<DeclarativeColor> *list)
+{
+    return reinterpret_cast<DeclarativeTheme3D *>(list->data)->colorList().size();
+}
+
+DeclarativeColor *DeclarativeTheme3D::atBaseColorsFunc(QQmlListProperty<DeclarativeColor> *list,
+                                                       int index)
+{
+    return reinterpret_cast<DeclarativeTheme3D *>(list->data)->colorList().at(index);
+}
+
+void DeclarativeTheme3D::clearBaseColorsFunc(QQmlListProperty<DeclarativeColor> *list)
+{
+    reinterpret_cast<DeclarativeTheme3D *>(list->data)->clearColors();
+}
 
 QQmlListProperty<ColorGradient> DeclarativeTheme3D::baseGradients()
 {
diff --git a/src/datavisualizationqml2/declarativetheme_p.h b/src/datavisualizationqml2/declarativetheme_p.h
index 75ab9514..79c1f5c9 100644
--- a/src/datavisualizationqml2/declarativetheme_p.h
+++ b/src/datavisualizationqml2/declarativetheme_p.h
@@ -30,8 +30,8 @@
 #define DECLARATIVETHEME_P_H
 
 #include "datavisualizationglobal_p.h"
+#include "declarativecolor_p.h"
 #include "colorgradient_p.h"
-//#include "declarativecolor_p.h"
 #include "q3dtheme.h"
 
 QT_DATAVISUALIZATION_BEGIN_NAMESPACE
@@ -40,7 +40,7 @@ class DeclarativeTheme3D : public Q3DTheme
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<QObject> seriesChildren READ seriesChildren)
-//    Q_PROPERTY(QQmlListProperty<DeclarativeColor> baseColors READ baseColors)
+    Q_PROPERTY(QQmlListProperty<DeclarativeColor> baseColors READ baseColors)
     Q_PROPERTY(QQmlListProperty<ColorGradient> baseGradients READ baseGradients)
     Q_PROPERTY(ColorGradient *singleHighlightGradient READ singleHighlightGradient WRITE setSingleHighlightGradient NOTIFY singleHighlightGradientChanged)
     Q_PROPERTY(ColorGradient *multiHighlightGradient READ multiHighlightGradient WRITE setMultiHighlightGradient NOTIFY multiHighlightGradientChanged)
@@ -53,12 +53,12 @@ public:
     QQmlListProperty<QObject> seriesChildren();
     static void appendSeriesChildren(QQmlListProperty<QObject> *list, QObject *element);
 
-//    QQmlListProperty<DeclarativeColor> baseColors();
-//    static void appendBaseColorsFunc(QQmlListProperty<DeclarativeColor> *list,
-//                                     DeclarativeColor *color);
-//    static int countBaseColorsFunc(QQmlListProperty<DeclarativeColor> *list);
-//    static DeclarativeColor *atBaseColorsFunc(QQmlListProperty<DeclarativeColor> *list, int index);
-//    static void clearBaseColorsFunc(QQmlListProperty<DeclarativeColor> *list);
+    QQmlListProperty<DeclarativeColor> baseColors();
+    static void appendBaseColorsFunc(QQmlListProperty<DeclarativeColor> *list,
+                                     DeclarativeColor *color);
+    static int countBaseColorsFunc(QQmlListProperty<DeclarativeColor> *list);
+    static DeclarativeColor *atBaseColorsFunc(QQmlListProperty<DeclarativeColor> *list, int index);
+    static void clearBaseColorsFunc(QQmlListProperty<DeclarativeColor> *list);
 
     QQmlListProperty<ColorGradient> baseGradients();
     static void appendBaseGradientsFunc(QQmlListProperty<ColorGradient> *list,
@@ -78,6 +78,8 @@ signals:
     void multiHighlightGradientChanged(ColorGradient *gradient);
 
 protected:
+    void handleBaseColorUpdate();
+    void handleBaseGradientUpdate();
     void handleSingleHLGradientUpdate();
     void handleMultiHLGradientUpdate();
 
@@ -88,18 +90,27 @@ protected:
     };
 
 private:
-//    void addColor(const DeclarativeColor &color);
-//    QList<DeclarativeColor> colorList() const;
-//    void clearColors();
+    void addColor(DeclarativeColor *color);
+    QList<DeclarativeColor *> colorList();
+    void clearColors();
+    void clearDummyColors();
+
     void addGradient(ColorGradient *gradient);
-    QList<ColorGradient *> gradientList() const;
+    QList<ColorGradient *> gradientList();
     void clearGradients();
+    void clearDummyGradients();
+
     void setThemeGradient(ColorGradient *gradient, GradientType type);
     QLinearGradient convertGradient(ColorGradient *gradient);
+    ColorGradient *convertGradient(const QLinearGradient &gradient);
 
+    QList<DeclarativeColor *> m_colors; // Not owned
     QList<ColorGradient *> m_gradients; // Not owned
     ColorGradient *m_singleHLGradient; // Not owned
     ColorGradient *m_multiHLGradient; // Not owned
+
+    bool m_dummyGradients;
+    bool m_dummyColors;
 };
 
 QT_DATAVISUALIZATION_END_NAMESPACE