From 3ce4ae10e54e9c5d73826f4d6f8c5e442ac2d525 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= <tomi.korpipaa@digia.com>
Date: Fri, 22 Nov 2013 07:56:04 +0200
Subject: User-modifiable themes, part 1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 tests/multigraphs/data.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'tests/multigraphs')

diff --git a/tests/multigraphs/data.cpp b/tests/multigraphs/data.cpp
index a488a276..f69c296e 100644
--- a/tests/multigraphs/data.cpp
+++ b/tests/multigraphs/data.cpp
@@ -24,6 +24,7 @@
 #include <QtDataVisualization/QBar3DSeries>
 #include <QtDataVisualization/QScatter3DSeries>
 #include <QtDataVisualization/QSurface3DSeries>
+#include <QtDataVisualization/Q3DTheme>
 #include <QScrollBar>
 #include <QSize>
 #include <QImage>
@@ -44,7 +45,7 @@ Data::Data(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars,
     m_started(false)
 {
     // Initialize surface
-    m_surface->setTheme(QDataVis::ThemeIsabelle);
+    m_surface->setTheme(new Q3DTheme(QDataVis::ThemeIsabelle));
     QLinearGradient gradient;
     gradient.setColorAt(0.0, Qt::black);
     gradient.setColorAt(0.33, Qt::blue);
@@ -60,7 +61,7 @@ Data::Data(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars,
     m_surface->addSeries(new QSurface3DSeries(new QHeightMapSurfaceDataProxy()));
 
     // Initialize scatter
-    m_scatter->setTheme(QDataVis::ThemeStoneMoss);
+    m_scatter->setTheme(new Q3DTheme(QDataVis::ThemeStoneMoss));
     m_scatter->setSelectionMode(QDataVis::SelectionNone);
     m_scatter->setGridVisible(false);
     m_scatter->setObjectType(QDataVis::MeshStylePoints);
@@ -69,7 +70,7 @@ Data::Data(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars,
     m_scatter->addSeries(new QScatter3DSeries);
 
     // Initialize bars
-    m_bars->setTheme(QDataVis::ThemeQt);
+    m_bars->setTheme(new Q3DTheme(QDataVis::ThemeQt));
     m_bars->setSelectionMode(QDataVis::SelectionItemAndRow | QDataVis::SelectionSlice);
     m_bars->setGridVisible(false);
     m_bars->setBarType(QDataVis::MeshStyleBars, false);
@@ -179,7 +180,7 @@ void Data::scrollDown()
 
 void Data::useGradientOne()
 {
-    m_surface->setTheme(QDataVis::ThemeIsabelle);
+    m_surface->setTheme(new Q3DTheme(QDataVis::ThemeIsabelle));
     QLinearGradient gradient;
     gradient.setColorAt(0.0, Qt::black);
     gradient.setColorAt(0.33, Qt::blue);
@@ -191,7 +192,7 @@ void Data::useGradientOne()
 
 void Data::useGradientTwo()
 {
-    m_surface->setTheme(QDataVis::ThemeQt);
+    m_surface->setTheme(new Q3DTheme(QDataVis::ThemeQt));
     QLinearGradient gradient;
     gradient.setColorAt(0.0, Qt::white);
     gradient.setColorAt(0.8, Qt::red);
-- 
cgit v1.2.3