Gradient setting API added to Surface

Task-number: QTRD-2288

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

4 files changed, 17 insertions, 11 deletions

diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
index 3a700d1d..db3cb6f5 100644
--- a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
+++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
@@ -25,6 +25,8 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 void Datavis3Dqml2Plugin::registerTypes(const char *uri)
 {
     // @uri com.digia.QtDataVisualization
+    qmlRegisterUncreatableType<QLinearGradient>(uri, 1, 0, "LinearGradient",
+                                                QLatin1String("Trying to create uncreatable: LinearGradient."));
     qmlRegisterUncreatableType<const QAbstractItemModel>(uri, 1, 0, "AbstractItemModel",
                                                          QLatin1String("Trying to create uncreatable: AbstractItemModel."));
     qmlRegisterUncreatableType<QDataVis>(uri, 1, 0, "DataVis",
diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.h b/src/datavisualizationqml2/datavisualizationqml2_plugin.h
index 530b8fd2..19106279 100644
--- a/src/datavisualizationqml2/datavisualizationqml2_plugin.h
+++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.h
@@ -46,6 +46,7 @@ Q_DECLARE_METATYPE(QItemModelScatterDataMapping *)
 Q_DECLARE_METATYPE(QItemModelSurfaceDataMapping *)
 
 Q_DECLARE_METATYPE(const QAbstractItemModel *)
+Q_DECLARE_METATYPE(QLinearGradient)
 
 Q_DECLARE_METATYPE(QDataVis *)
 
diff --git a/src/datavisualizationqml2/declarativesurface.cpp b/src/datavisualizationqml2/declarativesurface.cpp
index 551f6dbc..48eec8ce 100644
--- a/src/datavisualizationqml2/declarativesurface.cpp
+++ b/src/datavisualizationqml2/declarativesurface.cpp
@@ -225,6 +225,16 @@ QDataVis::ShadowQuality DeclarativeSurface::shadowQuality()
     return m_shared->shadowQuality();
 }
 
+void DeclarativeSurface::setGradient(const QLinearGradient &gradient)
+{
+    m_shared->setGradient(gradient);
+}
+
+QLinearGradient DeclarativeSurface::gradient() const
+{
+    return m_shared->gradient();
+}
+
 void DeclarativeSurface::setItemLabelFormat(const QString &format)
 {
     m_shared->activeDataProxy()->setItemLabelFormat(format);
diff --git a/src/datavisualizationqml2/declarativesurface_p.h b/src/datavisualizationqml2/declarativesurface_p.h
index 7884483b..21555fcc 100644
--- a/src/datavisualizationqml2/declarativesurface_p.h
+++ b/src/datavisualizationqml2/declarativesurface_p.h
@@ -59,6 +59,7 @@ class DeclarativeSurface : public QQuickItem
     Q_PROPERTY(bool backgroundVisible READ isBackgroundVisible WRITE setBackgroundVisible)
     Q_PROPERTY(bool smoothSurfaceEnabled READ isSmoothSurfaceEnabled WRITE setSmoothSurfaceEnabled)
     Q_PROPERTY(bool surfaceGridEnabled READ isSurfaceGridEnabled WRITE setSurfaceGridEnabled)
+    Q_PROPERTY(QLinearGradient gradient READ gradient WRITE setGradient)
     Q_PROPERTY(QString itemLabelFormat READ itemLabelFormat WRITE setItemLabelFormat)
     Q_ENUMS(QtDataVisualization::QDataVis::SelectionMode)
     Q_ENUMS(QtDataVisualization::QDataVis::ShadowQuality)
@@ -82,47 +83,39 @@ public:
     Q3DValueAxis *axisZ() const;
     void setAxisZ(Q3DValueAxis *axis);
 
-    // Select preset camera placement
     void setCameraPreset(QDataVis::CameraPreset preset);
     QDataVis::CameraPreset cameraPreset();
 
-    // Set theme (object colors, shaders, window color, background colors, light intensity and text
-    // colors are affected)
     void setTheme(QDataVis::ColorTheme theme);
     QDataVis::ColorTheme theme();
 
-    // Change selection mode
     void setSelectionMode(QDataVis::SelectionMode mode);
     QDataVis::SelectionMode selectionMode();
 
-    // Set font
     void setFont(const QFont &font);
     QFont font();
 
-    // Label transparency adjustment
     void setLabelTransparency(QDataVis::LabelTransparency transparency);
     QDataVis::LabelTransparency labelTransparency();
 
-    // Enable or disable background grid
     void setGridVisible(bool visible);
     bool isGridVisible();
 
-    // Enable or disable background mesh
     void setBackgroundVisible(bool visible);
     bool isBackgroundVisible();
 
-    // Enable or disable the smoothes of the surface
     void setSmoothSurfaceEnabled(bool enabled);
     bool isSmoothSurfaceEnabled() const;
 
-    // Enable or disable the grid on the surface
     void setSurfaceGridEnabled(bool enabled);
     bool isSurfaceGridEnabled() const;
 
-    // Adjust shadow quality
     void setShadowQuality(QDataVis::ShadowQuality quality);
     QDataVis::ShadowQuality shadowQuality();
 
+    void setGradient(const QLinearGradient &gradient);
+    QLinearGradient gradient() const;
+
     void setItemLabelFormat(const QString &format);
     QString itemLabelFormat();