From 7bc0b11a81b7cd1eccd48c222e4fa96dda0182cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= <tomi.korpipaa@digia.com>
Date: Tue, 24 Sep 2013 11:30:10 +0300
Subject: Gradient setting API added to Surface

Task-number: QTRD-2288

Change-Id: Ibe8db55cb0435db71c1d2a9081e2dab746b46c07
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
---
 examples/qmlsurface/qml/qmlsurface/main.qml | 11 +++++++++--
 examples/surfacechart/chartmodifier.cpp     | 10 ++++++++--
 examples/surfacechart/chartmodifier.h       |  2 +-
 examples/surfacechart/main.cpp              |  9 +++++----
 4 files changed, 23 insertions(+), 9 deletions(-)

(limited to 'examples')

diff --git a/examples/qmlsurface/qml/qmlsurface/main.qml b/examples/qmlsurface/qml/qmlsurface/main.qml
index 7d83c1a0..758b0346 100644
--- a/examples/qmlsurface/qml/qmlsurface/main.qml
+++ b/examples/qmlsurface/qml/qmlsurface/main.qml
@@ -37,6 +37,12 @@ Item {
         height: mainview.height
         anchors.right: mainview.right;
 
+        Gradient {
+            id: surfaceGradient
+            GradientStop { position: 0.0; color: "darkslategray" }
+            GradientStop { position: 1.0; color: "peru" }
+        }
+
         Surface3D {
             id: surfaceplot
             width: surfaceView.width
@@ -60,9 +66,10 @@ Item {
             axisY.segmentCount: 5
             axisY.subSegmentCount: 2
             axisY.labelFormat: "%i"
+            //gradient: surfaceGradient
             Component.onCompleted: {
-                setGradientColorAt(0, "black");
-                setGradientColorAt(1, "white");
+                setGradientColorAt(0, "darkslategray");
+                setGradientColorAt(1, "peru");
             }
         }
     }
diff --git a/examples/surfacechart/chartmodifier.cpp b/examples/surfacechart/chartmodifier.cpp
index 41be0ecc..b9ee56d0 100644
--- a/examples/surfacechart/chartmodifier.cpp
+++ b/examples/surfacechart/chartmodifier.cpp
@@ -21,6 +21,7 @@
 #include <QtDataVisualization/QSurfaceDataProxy>
 
 #include <qmath.h>
+#include <QLinearGradient>
 #include <QDebug>
 
 QT_DATAVISUALIZATION_USE_NAMESPACE
@@ -214,9 +215,14 @@ void ChartModifier::adjustZMin(int min)
     qDebug() << "Z Minimum =" << min;
 }
 
-void ChartModifier::colorPressed()
+void ChartModifier::gradientPressed()
 {
-    m_chart->setGradientColorAt(0.0, Qt::blue);
+    QLinearGradient gradient;
+    gradient.setColorAt(0.0, Qt::black);
+    gradient.setColorAt(0.33, Qt::blue);
+    gradient.setColorAt(0.67, Qt::red);
+    gradient.setColorAt(1.0, Qt::yellow);
+    m_chart->setGradient(gradient);
 }
 
 void ChartModifier::changeFont(const QFont &font)
diff --git a/examples/surfacechart/chartmodifier.h b/examples/surfacechart/chartmodifier.h
index 8d121976..bcd71e30 100644
--- a/examples/surfacechart/chartmodifier.h
+++ b/examples/surfacechart/chartmodifier.h
@@ -57,7 +57,7 @@ public:
     void adjustXMin(int min);
     void adjustZMin(int min);
     void updateSamples();
-    void colorPressed();
+    void gradientPressed();
     void changeFont(const QFont &font);
     void changeTransparency();
 
diff --git a/examples/surfacechart/main.cpp b/examples/surfacechart/main.cpp
index 00f3a1c9..370993df 100644
--- a/examples/surfacechart/main.cpp
+++ b/examples/surfacechart/main.cpp
@@ -122,9 +122,10 @@ int main(int argc, char *argv[])
     axisMinSliderZ->setEnabled(true);
 
     QLinearGradient gr(0, 0, 100, 1);
-    gr.setColorAt(0.0, Qt::blue);
-    gr.setColorAt(0.5, Qt::yellow);
-    gr.setColorAt(1.0, Qt::red);
+    gr.setColorAt(0.0, Qt::black);
+    gr.setColorAt(0.33, Qt::blue);
+    gr.setColorAt(0.67, Qt::red);
+    gr.setColorAt(1.0, Qt::yellow);
     QPixmap pm(100, 24);
     QPainter pmp(&pm);
     pmp.setBrush(QBrush(gr));
@@ -217,7 +218,7 @@ int main(int argc, char *argv[])
     QObject::connect(axisMinSliderZ, &QSlider::valueChanged,
                      modifier, &ChartModifier::adjustZMin);
     QObject::connect(colorPB, &QPushButton::pressed,
-                     modifier, &ChartModifier::colorPressed);
+                     modifier, &ChartModifier::gradientPressed);
     QObject::connect(fontList, &QFontComboBox::currentFontChanged,
                      modifier, &ChartModifier::changeFont);
     QObject::connect(labelButton, &QPushButton::clicked,
-- 
cgit v1.2.3