1 files changed, 122 insertions, 52 deletions

diff --git a/src/datavisualizationqml2/declarativetheme.cpp b/src/datavisualizationqml2/declarativetheme.cpp
index eb7fd2cc..263fa62e 100644
--- a/src/datavisualizationqml2/declarativetheme.cpp
+++ b/src/datavisualizationqml2/declarativetheme.cpp
@@ -22,7 +22,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 DeclarativeTheme3D::DeclarativeTheme3D(QObject *parent)
     : Q3DTheme(parent),
-      m_baseGradient(0),
+      m_gradients(QList<ColorGradient *>()),
       m_singleHLGradient(0),
       m_multiHLGradient(0)
 {
@@ -45,48 +45,16 @@ void DeclarativeTheme3D::appendSeriesChildren(QQmlListProperty<QObject> *list, Q
     // Nothing to do, seriesChildren is there only to enable scoping gradient items in Theme3D item.
 }
 
-void DeclarativeTheme3D::handleBaseGradientUpdate()
-{
-    if (m_baseGradient)
-        setThemeGradient(*m_baseGradient, GradientTypeBase);
-}
-
 void DeclarativeTheme3D::handleSingleHLGradientUpdate()
 {
     if (m_singleHLGradient)
-        setThemeGradient(*m_singleHLGradient, GradientTypeSingleHL);
+        setThemeGradient(m_singleHLGradient, GradientTypeSingleHL);
 }
 
 void DeclarativeTheme3D::handleMultiHLGradientUpdate()
 {
     if (m_multiHLGradient)
-        setThemeGradient(*m_multiHLGradient, GradientTypeMultiHL);
-}
-
-void DeclarativeTheme3D::setBaseGradient(ColorGradient *gradient)
-{
-    // connect new / disconnect old
-    if (gradient != m_baseGradient) {
-        if (m_baseGradient)
-            QObject::disconnect(m_baseGradient, 0, this, 0);
-
-        m_baseGradient = gradient;
-
-        if (m_baseGradient) {
-            QObject::connect(m_baseGradient, &ColorGradient::updated, this,
-                             &DeclarativeTheme3D::handleBaseGradientUpdate);
-        }
-
-        emit baseGradientChanged(m_baseGradient);
-    }
-
-    if (m_baseGradient)
-        setThemeGradient(*m_baseGradient, GradientTypeBase);
-}
-
-ColorGradient *DeclarativeTheme3D::baseGradient() const
-{
-    return m_baseGradient;
+        setThemeGradient(m_multiHLGradient, GradientTypeMultiHL);
 }
 
 void DeclarativeTheme3D::setSingleHighlightGradient(ColorGradient *gradient)
@@ -107,7 +75,7 @@ void DeclarativeTheme3D::setSingleHighlightGradient(ColorGradient *gradient)
     }
 
     if (m_singleHLGradient)
-        setThemeGradient(*m_singleHLGradient, GradientTypeSingleHL);
+        setThemeGradient(m_singleHLGradient, GradientTypeSingleHL);
 }
 
 ColorGradient *DeclarativeTheme3D::singleHighlightGradient() const
@@ -133,7 +101,7 @@ void DeclarativeTheme3D::setMultiHighlightGradient(ColorGradient *gradient)
     }
 
     if (m_multiHLGradient)
-        setThemeGradient(*m_baseGradient, GradientTypeMultiHL);
+        setThemeGradient(m_multiHLGradient, GradientTypeMultiHL);
 }
 
 ColorGradient *DeclarativeTheme3D::multiHighlightGradient() const
@@ -141,11 +109,28 @@ ColorGradient *DeclarativeTheme3D::multiHighlightGradient() const
     return m_multiHLGradient;
 }
 
-void DeclarativeTheme3D::setThemeGradient(const ColorGradient &gradient, GradientType type)
+void DeclarativeTheme3D::setThemeGradient(ColorGradient *gradient, GradientType type)
+{
+    QLinearGradient newGradient = convertGradient(gradient);
+
+    switch (type) {
+    case GradientTypeSingleHL:
+        Q3DTheme::setSingleHighlightGradient(newGradient);
+        break;
+    case GradientTypeMultiHL:
+        break;
+        Q3DTheme::setMultiHighlightGradient(newGradient);
+    default:
+        qWarning("Incorrect usage. Type may be GradientTypeSingleHL or GradientTypeMultiHL.");
+        break;
+    }
+}
+
+QLinearGradient DeclarativeTheme3D::convertGradient(ColorGradient *gradient)
 {
     QLinearGradient newGradient;
     QGradientStops stops;
-    QList<ColorGradientStop *> qmlstops = gradient.m_stops;
+    QList<ColorGradientStop *> qmlstops = gradient->m_stops;
 
     // Get sorted gradient stops
     for (int i = 0; i < qmlstops.size(); i++) {
@@ -156,19 +141,104 @@ void DeclarativeTheme3D::setThemeGradient(const ColorGradient &gradient, Gradien
     }
 
     newGradient.setStops(stops);
-    switch (type) {
-    case GradientTypeBase:
-        Q3DTheme::setBaseGradient(newGradient);
-        break;
-    case GradientTypeSingleHL:
-        Q3DTheme::setSingleHighlightGradient(newGradient);
-        break;
-    case GradientTypeMultiHL:
-        break;
-        Q3DTheme::setMultiHighlightGradient(newGradient);
-    default:
-        break;
-    }
+
+    return newGradient;
+}
+
+//void DeclarativeTheme3D::addColor(const DeclarativeColor &color)
+//{
+//    QList<QColor> list = Q3DTheme::baseColors();
+//    list.append(color);
+//    Q3DTheme::setBaseColors(list);
+//}
+
+//QList<DeclarativeColor> DeclarativeTheme3D::colorList() const
+//{
+//    return Q3DTheme::baseColors();
+//}
+
+//void DeclarativeTheme3D::clearColors()
+//{
+//    Q3DTheme::setBaseColors(QList<QColor>());
+//}
+
+void DeclarativeTheme3D::addGradient(ColorGradient *gradient)
+{
+    m_gradients.append(gradient);
+    QList<QLinearGradient> list = Q3DTheme::baseGradients();
+    list.append(convertGradient(gradient));
+    Q3DTheme::setBaseGradients(list);
+}
+
+QList<ColorGradient *> DeclarativeTheme3D::gradientList() const
+{
+    return m_gradients;
+}
+
+void DeclarativeTheme3D::clearGradients()
+{
+    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();
+//}
+
+QQmlListProperty<ColorGradient> DeclarativeTheme3D::baseGradients()
+{
+    return QQmlListProperty<ColorGradient>(this, this,
+                                           &DeclarativeTheme3D::appendBaseGradientsFunc,
+                                           &DeclarativeTheme3D::countBaseGradientsFunc,
+                                           &DeclarativeTheme3D::atBaseGradientsFunc,
+                                           &DeclarativeTheme3D::clearBaseGradientsFunc);
+}
+
+void DeclarativeTheme3D::appendBaseGradientsFunc(QQmlListProperty<ColorGradient> *list,
+                                                 ColorGradient *gradient)
+{
+    reinterpret_cast<DeclarativeTheme3D *>(list->data)->addGradient(gradient);
+}
+
+int DeclarativeTheme3D::countBaseGradientsFunc(QQmlListProperty<ColorGradient> *list)
+{
+    return reinterpret_cast<DeclarativeTheme3D *>(list->data)->gradientList().size();
+}
+
+ColorGradient *DeclarativeTheme3D::atBaseGradientsFunc(QQmlListProperty<ColorGradient> *list,
+                                                       int index)
+{
+    return reinterpret_cast<DeclarativeTheme3D *>(list->data)->gradientList().at(index);
+}
+
+void DeclarativeTheme3D::clearBaseGradientsFunc(QQmlListProperty<ColorGradient> *list)
+{
+    reinterpret_cast<DeclarativeTheme3D *>(list->data)->clearGradients();
 }
 
 QT_DATAVISUALIZATION_END_NAMESPACE