User-modifiable themes, part 1

Task-number: QTRD-2120

+ old functionality remade
- new functionality to be added

+ fixed a compilation error in qbarseries for mingw

Change-Id: I710c97b5d4023861be8e8cc5cc61c05bb4644964
Signed-off-by: Tomi Korpipää <tomi.korpipaa@digia.com>

10 files changed, 22 insertions, 14 deletions

diff --git a/examples/audiolevels/audiolevels.cpp b/examples/audiolevels/audiolevels.cpp
index 4c64cbbe..0fc6d3c5 100644
--- a/examples/audiolevels/audiolevels.cpp
+++ b/examples/audiolevels/audiolevels.cpp
@@ -24,6 +24,7 @@
 #include <QtDataVisualization/q3dscene.h>
 #include <QtDataVisualization/q3dcamera.h>
 #include <QtDataVisualization/qbar3dseries.h>
+#include <QtDataVisualization/q3dtheme.h>
 
 #include <QAudioDeviceInfo>
 #include <QAudioInput>
@@ -47,7 +48,7 @@ AudioLevels::AudioLevels(Q3DBars *graph, QObject *parent)
     m_graph->setShadowQuality(QDataVis::ShadowQualityNone);
     m_graph->setSelectionMode(QDataVis::SelectionNone);
     m_graph->scene()->activeCamera()->setCameraPosition(-25.0, 10.0, 190.0);
-    m_graph->setTheme(QDataVis::ThemeIsabelle);
+    m_graph->setTheme(new Q3DTheme(QDataVis::ThemeIsabelle));
     m_graph->setBarType(QDataVis::MeshStyleBars);
     m_graph->addSeries(new QBar3DSeries);
 
diff --git a/examples/audiolevels/main.cpp b/examples/audiolevels/main.cpp
index 524c53b1..bdeb74b3 100644
--- a/examples/audiolevels/main.cpp
+++ b/examples/audiolevels/main.cpp
@@ -28,7 +28,7 @@ int main(int argc, char *argv[])
     QGuiApplication app(argc, argv);
 
     Q3DBars window;
-    window.resize(900, 1000);
+    window.resize(800, 500);
     window.setTitle("Qt Data Visualization - Microphone audio levels visualizer");
     window.show();
 
diff --git a/examples/bars/graphmodifier.cpp b/examples/bars/graphmodifier.cpp
index 132ba4d6..f38d88e9 100644
--- a/examples/bars/graphmodifier.cpp
+++ b/examples/bars/graphmodifier.cpp
@@ -23,6 +23,7 @@
 #include <QtDataVisualization/q3dscene.h>
 #include <QtDataVisualization/q3dcamera.h>
 #include <QtDataVisualization/qbar3dseries.h>
+#include <QtDataVisualization/q3dtheme.h>
 #include <QTime>
 #include <QComboBox>
 
@@ -174,7 +175,7 @@ void GraphModifier::changePresetCamera()
 
 void GraphModifier::changeTheme(int theme)
 {
-    m_graph->setTheme((QDataVis::Theme)theme);
+    m_graph->setTheme(new Q3DTheme(QDataVis::Theme(theme)));
 }
 
 void GraphModifier::changeLabelStyle()
diff --git a/examples/customproxy/rainfallgraph.cpp b/examples/customproxy/rainfallgraph.cpp
index 36ab9786..a31200e8 100644
--- a/examples/customproxy/rainfallgraph.cpp
+++ b/examples/customproxy/rainfallgraph.cpp
@@ -22,6 +22,7 @@
 #include <QtDataVisualization/q3dscene.h>
 #include <QtDataVisualization/q3dcamera.h>
 #include <QtDataVisualization/qbar3dseries.h>
+#include <QtDataVisualization/q3dtheme.h>
 #include <QGuiApplication>
 #include <QFont>
 #include <QDebug>
@@ -74,7 +75,7 @@ RainfallGraph::RainfallGraph(Q3DBars *rainfall)
     m_graph->setSelectionMode(QDataVis::SelectionItemAndColumn | QDataVis::SelectionSlice);
 
     // Set theme
-    m_graph->setTheme(QDataVis::ThemeArmyBlue);
+    m_graph->setTheme(new Q3DTheme(QDataVis::ThemeArmyBlue));
 
     // Set camera position and zoom
     m_graph->scene()->activeCamera()->setCameraPreset(QDataVis::CameraPresetIsometricRightHigh);
diff --git a/examples/itemmodel/main.cpp b/examples/itemmodel/main.cpp
index 3325d6a2..0c9ee0cb 100644
--- a/examples/itemmodel/main.cpp
+++ b/examples/itemmodel/main.cpp
@@ -23,6 +23,7 @@
 #include <QtDataVisualization/q3dscene.h>
 #include <QtDataVisualization/q3dcamera.h>
 #include <QtDataVisualization/qbar3dseries.h>
+#include <QtDataVisualization/q3dtheme.h>
 
 #include <QApplication>
 #include <QVBoxLayout>
@@ -113,7 +114,7 @@ GraphDataGenerator::GraphDataGenerator(Q3DBars *bargraph, QTableWidget *tableWid
     //! [7]
 
     // Set theme
-    m_graph->setTheme(QDataVis::ThemeDigia);
+    m_graph->setTheme(new Q3DTheme(QDataVis::ThemeDigia));
 
     // Set preset camera position
     m_graph->scene()->activeCamera()->setCameraPreset(QDataVis::CameraPresetFront);
diff --git a/examples/qmlbars/qml/qmlbars/main.qml b/examples/qmlbars/qml/qmlbars/main.qml
index a3274f25..de1275ee 100644
--- a/examples/qmlbars/qml/qmlbars/main.qml
+++ b/examples/qmlbars/qml/qmlbars/main.qml
@@ -79,7 +79,7 @@ Item {
             shadowQuality: AbstractGraph3D.ShadowQualityMedium
             selectionMode: AbstractGraph3D.SelectionItem
             font.pointSize: 35
-            theme: AbstractGraph3D.ThemeRetro
+            theme: Theme3D { type: AbstractGraph3D.ThemeRetro }
             labelStyle: AbstractGraph3D.LabelStyleFromTheme
             barThickness: 0.7
             barSpacing: Qt.size(0.5, 0.5)
diff --git a/examples/qmlscatter/qml/qmlscatter/main.qml b/examples/qmlscatter/qml/qmlscatter/main.qml
index 6cae72f8..8ca73628 100644
--- a/examples/qmlscatter/qml/qmlscatter/main.qml
+++ b/examples/qmlscatter/qml/qmlscatter/main.qml
@@ -53,7 +53,7 @@ Item {
             //! [3]
             font.family: "Lucida Handwriting"
             font.pointSize: 40
-            theme: AbstractGraph3D.ThemeIsabelle
+            theme: Theme3D { type: AbstractGraph3D.ThemeIsabelle }
             shadowQuality: AbstractGraph3D.ShadowQualitySoftLow
             //! [3]
             //! [6]
@@ -135,10 +135,12 @@ Item {
         text: "Change Theme"
         anchors.left: cameraToggle.right
         onClicked: {
-            if (scatterGraph.theme === AbstractGraph3D.ThemeArmyBlue) {
-                scatterGraph.theme = AbstractGraph3D.ThemeIsabelle;
+            if (scatterGraph.theme.type === AbstractGraph3D.ThemeArmyBlue) {
+                // Ownership of the theme is transferred and old theme is destroyed when setting
+                // a new one, so we need to create them dynamically
+                scatterGraph.theme = Qt.createQmlObject('import QtDataVisualization 1.0; Theme3D {type: AbstractGraph3D.ThemeIsabelle}', parent);
             } else {
-                scatterGraph.theme = AbstractGraph3D.ThemeArmyBlue;
+                scatterGraph.theme = Qt.createQmlObject('import QtDataVisualization 1.0; Theme3D {type: AbstractGraph3D.ThemeArmyBlue}', parent);
             }
         }
     }
diff --git a/examples/qmlsurface/qml/qmlsurface/main.qml b/examples/qmlsurface/qml/qmlsurface/main.qml
index 2b44b1d4..a78ac796 100644
--- a/examples/qmlsurface/qml/qmlsurface/main.qml
+++ b/examples/qmlsurface/qml/qmlsurface/main.qml
@@ -49,7 +49,7 @@ Item {
             id: surfaceplot
             width: surfaceView.width
             height: surfaceView.height
-            theme: AbstractGraph3D.ThemeStoneMoss
+            theme: Theme3D { type: AbstractGraph3D.ThemeStoneMoss }
             shadowQuality: AbstractGraph3D.ShadowQualityMedium
             selectionMode: AbstractGraph3D.SelectionSlice | AbstractGraph3D.SelectionItemAndRow
             smoothSurfaceEnabled: true
diff --git a/examples/scatter/scatterdatamodifier.cpp b/examples/scatter/scatterdatamodifier.cpp
index 1bdd089d..f92ffd0f 100644
--- a/examples/scatter/scatterdatamodifier.cpp
+++ b/examples/scatter/scatterdatamodifier.cpp
@@ -22,6 +22,7 @@
 #include <QtDataVisualization/q3dscene.h>
 #include <QtDataVisualization/q3dcamera.h>
 #include <QtDataVisualization/qscatter3dseries.h>
+#include <QtDataVisualization/q3dtheme.h>
 #include <qmath.h>
 using namespace QtDataVisualization;
 
@@ -40,7 +41,7 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter)
     font.setPointSize(m_fontSize);
     m_graph->setFont(font);
     m_graph->setObjectType(QDataVis::MeshStyleSpheres, true);
-    m_graph->setTheme(QDataVis::ThemeEbony);
+    m_graph->setTheme(new Q3DTheme(QDataVis::ThemeEbony));
     m_graph->setShadowQuality(QDataVis::ShadowQualitySoftLow);
     m_graph->scene()->activeCamera()->setCameraPreset(QDataVis::CameraPresetFront);
     //! [0]
@@ -128,7 +129,7 @@ void ScatterDataModifier::setSmoothDots(int smooth)
 
 void ScatterDataModifier::changeTheme(int theme)
 {
-    m_graph->setTheme((QDataVis::Theme)theme);
+    m_graph->setTheme(new Q3DTheme(QDataVis::Theme(theme)));
 }
 
 void ScatterDataModifier::changePresetCamera()
diff --git a/examples/surface/surfacegraph.cpp b/examples/surface/surfacegraph.cpp
index f5a2e00b..f774c537 100644
--- a/examples/surface/surfacegraph.cpp
+++ b/examples/surface/surfacegraph.cpp
@@ -19,6 +19,7 @@
 #include "surfacegraph.h"
 
 #include <QtDataVisualization/Q3DValueAxis>
+#include <QtDataVisualization/Q3DTheme>
 #include <QtGui/QImage>
 #include <QtCore/qmath.h>
 
@@ -224,7 +225,7 @@ void SurfaceGraph::setAxisZRange(qreal min, qreal max)
 //! [6]
 void SurfaceGraph::changeTheme(int theme)
 {
-    m_graph->setTheme((QDataVis::Theme)theme);
+    m_graph->setTheme(new Q3DTheme(QDataVis::Theme(theme)));
 }
 //! [6]