diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-11-22 07:56:04 +0200 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-11-22 08:30:09 +0200 |
| commit | 3ce4ae10e54e9c5d73826f4d6f8c5e442ac2d525 (patch) | |
| tree | 6ae0bb7c1ff8720f6340453b39d481ffcf526127 /tests/surfacetest | |
| parent | d12f993ca802ff02091d6a5141d2847641bc65a8 (diff) | |
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>
Diffstat (limited to 'tests/surfacetest')
| -rw-r--r-- | tests/surfacetest/graphmodifier.cpp | 3 | ||||
| -rw-r--r-- | tests/surfacetest/main.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/surfacetest/graphmodifier.cpp b/tests/surfacetest/graphmodifier.cpp index 4365e055..d415b9af 100644 --- a/tests/surfacetest/graphmodifier.cpp +++ b/tests/surfacetest/graphmodifier.cpp @@ -20,6 +20,7 @@ #include <QtDataVisualization/Q3DValueAxis> #include <QtDataVisualization/QSurfaceDataProxy> #include <QtDataVisualization/QSurface3DSeries> +#include <QtDataVisualization/Q3DTheme> #include <qmath.h> #include <QLinearGradient> @@ -334,7 +335,7 @@ void GraphModifier::selectedPointChanged(const QPoint &point) void GraphModifier::changeTheme(int theme) { - m_graph->setTheme((QDataVis::Theme)theme); + m_graph->setTheme(new Q3DTheme(QDataVis::Theme(theme))); } diff --git a/tests/surfacetest/main.cpp b/tests/surfacetest/main.cpp index fc33a4cf..acb6fa37 100644 --- a/tests/surfacetest/main.cpp +++ b/tests/surfacetest/main.cpp @@ -17,6 +17,7 @@ ****************************************************************************/ #include "graphmodifier.h" +#include <QtDataVisualization/q3dtheme.h> #include <QApplication> #include <QWidget> @@ -49,7 +50,7 @@ int main(int argc, char *argv[]) QSize screenSize = surfaceGraph->screen()->size(); // Set to default, should be same as the initial on themeList - surfaceGraph->setTheme(QDataVis::Theme(initialTheme)); + surfaceGraph->setTheme(new Q3DTheme(QDataVis::Theme(initialTheme))); QWidget *container = QWidget::createWindowContainer(surfaceGraph); container->setMinimumSize(QSize(screenSize.width() / 2, screenSize.height() / 2)); |