From 3ce4ae10e54e9c5d73826f4d6f8c5e442ac2d525 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= 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ää --- tests/barstest/chart.cpp | 202 +++++++++++++++++++-------------- tests/barstest/chart.h | 8 +- tests/barstest/main.cpp | 15 ++- tests/multigraphs/data.cpp | 11 +- tests/qmlcamera/qml/qmlcamera/main.qml | 2 +- tests/scattertest/scatterchart.cpp | 5 +- tests/surfacetest/graphmodifier.cpp | 3 +- tests/surfacetest/main.cpp | 3 +- 8 files changed, 150 insertions(+), 99 deletions(-) (limited to 'tests') diff --git a/tests/barstest/chart.cpp b/tests/barstest/chart.cpp index dda3aee4..14990640 100644 --- a/tests/barstest/chart.cpp +++ b/tests/barstest/chart.cpp @@ -22,14 +22,16 @@ #include #include #include +#include #include QT_DATAVISUALIZATION_USE_NAMESPACE const QString celsiusString = QString(QChar(0xB0)) + "C"; -GraphModifier::GraphModifier(Q3DBars *barchart) - : m_chart(barchart), +GraphModifier::GraphModifier(Q3DBars *barchart, QColorDialog *colorDialog) + : m_graph(barchart), + m_colorDialog(colorDialog), m_columnCount(21), m_rowCount(21), m_xRotation(0.0), @@ -101,30 +103,30 @@ GraphModifier::GraphModifier(Q3DBars *barchart) m_monthAxis->setTitle("Month"); - m_chart->addAxis(m_autoAdjustingAxis); - m_chart->addAxis(m_fixedRangeAxis); - m_chart->addAxis(m_temperatureAxis); - m_chart->addAxis(m_yearAxis); - m_chart->addAxis(m_monthAxis); - m_chart->addAxis(m_genericRowAxis); - m_chart->addAxis(m_genericColumnAxis); + m_graph->addAxis(m_autoAdjustingAxis); + m_graph->addAxis(m_fixedRangeAxis); + m_graph->addAxis(m_temperatureAxis); + m_graph->addAxis(m_yearAxis); + m_graph->addAxis(m_monthAxis); + m_graph->addAxis(m_genericRowAxis); + m_graph->addAxis(m_genericColumnAxis); - m_chart->setTheme(QDataVis::ThemeStoneMoss); - m_chart->setShadowQuality(QDataVis::ShadowQualitySoftMedium); + m_graph->setTheme(new Q3DTheme(QDataVis::ThemeStoneMoss)); + m_graph->setShadowQuality(QDataVis::ShadowQualitySoftMedium); m_temperatureData->setItemLabelFormat(QStringLiteral("1: @valueTitle for @colLabel @rowLabel: @valueLabel")); m_temperatureData2->setItemLabelFormat(QStringLiteral("2: @valueTitle for @colLabel @rowLabel: @valueLabel")); m_genericData->setItemLabelFormat(QStringLiteral("3: @valueTitle for (@rowIdx, @colIdx): @valueLabel")); m_genericData->dataProxy()->setColumnLabels(genericColumnLabels); - m_chart->setFont(QFont("Times Roman", 20)); + m_graph->setFont(QFont("Times Roman", 20)); // Release and store the default input handler. - m_defaultInputHandler = m_chart->activeInputHandler(); - m_chart->releaseInputHandler(m_defaultInputHandler); - m_chart->setActiveInputHandler(m_defaultInputHandler); + m_defaultInputHandler = m_graph->activeInputHandler(); + m_graph->releaseInputHandler(m_defaultInputHandler); + m_graph->setActiveInputHandler(m_defaultInputHandler); - QObject::connect(m_chart, &Q3DBars::shadowQualityChanged, this, + QObject::connect(m_graph, &Q3DBars::shadowQualityChanged, this, &GraphModifier::shadowQualityUpdatedByVisual); QObject::connect(m_temperatureData, &QBar3DSeries::selectedBarChanged, this, &GraphModifier::handleSelectionChange); @@ -133,15 +135,15 @@ GraphModifier::GraphModifier(Q3DBars *barchart) QObject::connect(m_genericData, &QBar3DSeries::selectedBarChanged, this, &GraphModifier::handleSelectionChange); - m_chart->addSeries(m_temperatureData); - m_chart->addSeries(m_temperatureData2); + m_graph->addSeries(m_temperatureData); + m_graph->addSeries(m_temperatureData2); resetTemperatureData(); } GraphModifier::~GraphModifier() { - delete m_chart; + delete m_graph; delete m_defaultInputHandler; } @@ -155,24 +157,24 @@ void GraphModifier::restart(bool dynamicData) m_static = !dynamicData; if (m_static) { - m_chart->removeSeries(m_genericData); + m_graph->removeSeries(m_genericData); - m_chart->setTitle(QStringLiteral("Average temperatures in Oulu, Finland (2006-2012)")); + m_graph->setTitle(QStringLiteral("Average temperatures in Oulu, Finland (2006-2012)")); - m_chart->setValueAxis(m_temperatureAxis); - m_chart->setRowAxis(m_yearAxis); - m_chart->setColumnAxis(m_monthAxis); + m_graph->setValueAxis(m_temperatureAxis); + m_graph->setRowAxis(m_yearAxis); + m_graph->setColumnAxis(m_monthAxis); } else { - m_chart->addSeries(m_genericData); + m_graph->addSeries(m_genericData); - m_chart->setTitle(QStringLiteral("Generic data")); + m_graph->setTitle(QStringLiteral("Generic data")); m_minval = m_fixedRangeAxis->min(); m_maxval = m_fixedRangeAxis->max(); - m_chart->setValueAxis(m_currentAxis); - m_chart->setRowAxis(m_genericRowAxis); - m_chart->setColumnAxis(m_genericColumnAxis); + m_graph->setValueAxis(m_currentAxis); + m_graph->setRowAxis(m_genericRowAxis); + m_graph->setColumnAxis(m_genericColumnAxis); } } @@ -181,9 +183,9 @@ void GraphModifier::selectBar() QPoint targetBar(5, 5); QPoint noSelection(-1, -1); if (m_selectedBar != targetBar) - m_chart->seriesList().at(0)->setSelectedBar(targetBar); + m_graph->seriesList().at(0)->setSelectedBar(targetBar); else - m_chart->seriesList().at(0)->setSelectedBar(noSelection); + m_graph->seriesList().at(0)->setSelectedBar(noSelection); } void GraphModifier::swapAxis() @@ -202,7 +204,7 @@ void GraphModifier::swapAxis() qDebug() << "default axis"; } - m_chart->setValueAxis(m_currentAxis); + m_graph->setValueAxis(m_currentAxis); } void GraphModifier::releaseAxes() @@ -210,32 +212,32 @@ void GraphModifier::releaseAxes() // Releases all axes - results in default axes for all dimensions. // Axes reset when the graph is switched as set*Axis calls are made, which // implicitly add axes. - m_chart->releaseAxis(m_autoAdjustingAxis); - m_chart->releaseAxis(m_fixedRangeAxis); - m_chart->releaseAxis(m_temperatureAxis); - m_chart->releaseAxis(m_yearAxis); - m_chart->releaseAxis(m_monthAxis); - m_chart->releaseAxis(m_genericRowAxis); - m_chart->releaseAxis(m_genericColumnAxis); + m_graph->releaseAxis(m_autoAdjustingAxis); + m_graph->releaseAxis(m_fixedRangeAxis); + m_graph->releaseAxis(m_temperatureAxis); + m_graph->releaseAxis(m_yearAxis); + m_graph->releaseAxis(m_monthAxis); + m_graph->releaseAxis(m_genericRowAxis); + m_graph->releaseAxis(m_genericColumnAxis); } void GraphModifier::releaseProxies() { // Releases all series/add all series toggle - if (m_chart->seriesList().size() > 0) { - m_chart->removeSeries(m_temperatureData); - m_chart->removeSeries(m_temperatureData2); - m_chart->removeSeries(m_genericData); + if (m_graph->seriesList().size() > 0) { + m_graph->removeSeries(m_temperatureData); + m_graph->removeSeries(m_temperatureData2); + m_graph->removeSeries(m_genericData); } else { - m_chart->addSeries(m_temperatureData); - m_chart->addSeries(m_temperatureData2); - m_chart->addSeries(m_genericData); + m_graph->addSeries(m_temperatureData); + m_graph->addSeries(m_temperatureData2); + m_graph->addSeries(m_genericData); } } void GraphModifier::flipViews() { - m_chart->scene()->setSecondarySubviewOnTop(!m_chart->scene()->isSecondarySubviewOnTop()); + m_graph->scene()->setSecondarySubviewOnTop(!m_graph->scene()->isSecondarySubviewOnTop()); } void GraphModifier::createMassiveArray() @@ -464,34 +466,34 @@ void GraphModifier::changeStyle() static int model = 0; switch (model) { case 0: - m_chart->setBarType(QDataVis::MeshStyleCylinders, false); + m_graph->setBarType(QDataVis::MeshStyleCylinders, false); break; case 1: - m_chart->setBarType(QDataVis::MeshStyleCylinders, true); + m_graph->setBarType(QDataVis::MeshStyleCylinders, true); break; case 2: - m_chart->setBarType(QDataVis::MeshStyleCones, false); + m_graph->setBarType(QDataVis::MeshStyleCones, false); break; case 3: - m_chart->setBarType(QDataVis::MeshStyleCones, true); + m_graph->setBarType(QDataVis::MeshStyleCones, true); break; case 4: - m_chart->setBarType(QDataVis::MeshStyleBars, false); + m_graph->setBarType(QDataVis::MeshStyleBars, false); break; case 5: - m_chart->setBarType(QDataVis::MeshStyleBars, true); + m_graph->setBarType(QDataVis::MeshStyleBars, true); break; case 6: - m_chart->setBarType(QDataVis::MeshStylePyramids, false); + m_graph->setBarType(QDataVis::MeshStylePyramids, false); break; case 7: - m_chart->setBarType(QDataVis::MeshStylePyramids, true); + m_graph->setBarType(QDataVis::MeshStylePyramids, true); break; case 8: - m_chart->setBarType(QDataVis::MeshStyleBevelBars, false); + m_graph->setBarType(QDataVis::MeshStyleBevelBars, false); break; case 9: - m_chart->setBarType(QDataVis::MeshStyleBevelBars, true); + m_graph->setBarType(QDataVis::MeshStyleBevelBars, true); break; } model++; @@ -503,7 +505,7 @@ void GraphModifier::changePresetCamera() { static int preset = QDataVis::CameraPresetFrontLow; - m_chart->scene()->activeCamera()->setCameraPreset((QDataVis::CameraPreset)preset); + m_graph->scene()->activeCamera()->setCameraPreset((QDataVis::CameraPreset)preset); if (++preset > QDataVis::CameraPresetDirectlyBelow) preset = QDataVis::CameraPresetFrontLow; @@ -513,7 +515,7 @@ void GraphModifier::changeTheme() { static int theme = QDataVis::ThemeQt; - m_chart->setTheme((QDataVis::Theme)theme); + m_graph->setTheme(new Q3DTheme((QDataVis::Theme)theme)); if (++theme > QDataVis::ThemeIsabelle) theme = QDataVis::ThemeQt; @@ -523,7 +525,7 @@ void GraphModifier::changeLabelStyle() { static int style = QDataVis::LabelStyleOpaque; - m_chart->setLabelStyle((QDataVis::LabelStyle)style); + m_graph->setLabelStyle((QDataVis::LabelStyle)style); if (++style > QDataVis::LabelStyleTransparent) style = QDataVis::LabelStyleOpaque; @@ -531,27 +533,27 @@ void GraphModifier::changeLabelStyle() void GraphModifier::changeSelectionMode() { - static int selectionMode = m_chart->selectionMode(); + static int selectionMode = m_graph->selectionMode(); if (++selectionMode > (QDataVis::SelectionItemAndColumn | QDataVis::SelectionSlice | QDataVis::SelectionMultiSeries)) selectionMode = QDataVis::SelectionNone; - m_chart->setSelectionMode((QDataVis::SelectionFlag)selectionMode); + m_graph->setSelectionMode((QDataVis::SelectionFlag)selectionMode); } void GraphModifier::changeFont(const QFont &font) { QFont newFont = font; newFont.setPointSize(m_fontSize); - m_chart->setFont(newFont); + m_graph->setFont(newFont); } void GraphModifier::changeFontSize(int fontsize) { m_fontSize = fontsize; - QFont font = m_chart->font(); + QFont font = m_graph->font(); font.setPointSize(m_fontSize); - m_chart->setFont(font); + m_graph->setFont(font); } void GraphModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality sq) @@ -565,7 +567,7 @@ void GraphModifier::handleSelectionChange(const QPoint &position) { m_selectedBar = position; int index = 0; - foreach (QBar3DSeries *series, m_chart->seriesList()) { + foreach (QBar3DSeries *series, m_graph->seriesList()) { if (series == sender()) break; index++; @@ -583,56 +585,56 @@ void GraphModifier::setUseNullInputHandler(bool useNull) m_useNullInputHandler = useNull; if (useNull) - m_chart->setActiveInputHandler(0); + m_graph->setActiveInputHandler(0); else - m_chart->setActiveInputHandler(m_defaultInputHandler); + m_graph->setActiveInputHandler(m_defaultInputHandler); } void GraphModifier::changeShadowQuality(int quality) { QDataVis::ShadowQuality sq = QDataVis::ShadowQuality(quality); - m_chart->setShadowQuality(sq); + m_graph->setShadowQuality(sq); emit shadowQualityChanged(quality); } void GraphModifier::setBackgroundEnabled(int enabled) { - m_chart->setBackgroundVisible((bool)enabled); + m_graph->setBackgroundVisible((bool)enabled); } void GraphModifier::setGridEnabled(int enabled) { - m_chart->setGridVisible((bool)enabled); + m_graph->setGridVisible((bool)enabled); } void GraphModifier::rotateX(int rotation) { m_xRotation = rotation; - m_chart->scene()->activeCamera()->setCameraPosition(m_xRotation, m_yRotation); + m_graph->scene()->activeCamera()->setCameraPosition(m_xRotation, m_yRotation); } void GraphModifier::rotateY(int rotation) { m_yRotation = rotation; - m_chart->scene()->activeCamera()->setCameraPosition(m_xRotation, m_yRotation); + m_graph->scene()->activeCamera()->setCameraPosition(m_xRotation, m_yRotation); } void GraphModifier::setSpecsRatio(int barwidth) { - m_chart->setBarThickness((qreal)barwidth / 30.0); + m_graph->setBarThickness((qreal)barwidth / 30.0); } void GraphModifier::setSpacingSpecsX(int spacing) { m_barSpacingX = (qreal)spacing / 100.0; - m_chart->setBarSpacing(QSizeF(m_barSpacingX, m_barSpacingZ)); + m_graph->setBarSpacing(QSizeF(m_barSpacingX, m_barSpacingZ)); } void GraphModifier::setSpacingSpecsZ(int spacing) { m_barSpacingZ = (qreal)spacing / 100.0; - m_chart->setBarSpacing(QSizeF(m_barSpacingX, m_barSpacingZ)); + m_graph->setBarSpacing(QSizeF(m_barSpacingX, m_barSpacingZ)); } void GraphModifier::setSampleCountX(int samples) @@ -670,6 +672,34 @@ void GraphModifier::setMaxY(int max) m_maxval = max; } +void GraphModifier::useOwnTheme() +{ + Q3DTheme *theme = new Q3DTheme(); + theme->setAmbientLightStrength(0.3f); + theme->setBackgroundColor(QColor(QRgb(0x99ca53))); + theme->setBaseColor(QColor(QRgb(0x209fdf))); + theme->setColorStyle(QDataVis::ColorStyleUniform); + theme->setGridLineColor(QColor(QRgb(0x99ca53))); + theme->setHighlightLightStrength(7.0f); + theme->setLabelBorderEnabled(false); + theme->setLightColor(Qt::white); + theme->setLightStrength(6.0f); + theme->setMultiHighlightColor(QColor(QRgb(0x6d5fd5))); + theme->setSingleHighlightColor(QColor(QRgb(0xf6a625))); + theme->setTextBackgroundColor(QColor(0xf6, 0xa6, 0x25, 0xa0)); + theme->setTextColor(QColor(QRgb(0x404044))); + theme->setWindowColor(QColor(QRgb(0xffffff))); + + m_graph->setTheme(theme); + + m_colorDialog->open(); +} + +void GraphModifier::changeBaseColor(const QColor &color) +{ + qDebug() << "base color changed to" << color; + m_graph->theme()->setBaseColor(color); +} void GraphModifier::setGradient() { @@ -697,19 +727,19 @@ void GraphModifier::setGradient() multiHighlightGradient.setColorAt(0.25, Qt::darkYellow); multiHighlightGradient.setColorAt(0.0, Qt::darkGray); - m_chart->setBarColor(Qt::green); - m_chart->setSingleHighlightColor(Qt::white); - m_chart->setMultiHighlightColor(Qt::cyan); + m_graph->setBarColor(Qt::green); + m_graph->setSingleHighlightColor(Qt::white); + m_graph->setMultiHighlightColor(Qt::cyan); - m_chart->setBarGradient(barGradient); - m_chart->setSingleHighlightGradient(singleHighlightGradient); - m_chart->setMultiHighlightGradient(multiHighlightGradient); + m_graph->setBarGradient(barGradient); + m_graph->setSingleHighlightGradient(singleHighlightGradient); + m_graph->setMultiHighlightGradient(multiHighlightGradient); - QDataVis::ColorStyle oldStyle = m_chart->colorStyle(); + QDataVis::ColorStyle oldStyle = m_graph->colorStyle(); if (oldStyle == QDataVis::ColorStyleUniform) - m_chart->setColorStyle(QDataVis::ColorStyleObjectGradient); + m_graph->setColorStyle(QDataVis::ColorStyleObjectGradient); else if (oldStyle == QDataVis::ColorStyleObjectGradient) - m_chart->setColorStyle(QDataVis::ColorStyleRangeGradient); + m_graph->setColorStyle(QDataVis::ColorStyleRangeGradient); if (oldStyle == QDataVis::ColorStyleRangeGradient) - m_chart->setColorStyle(QDataVis::ColorStyleUniform); + m_graph->setColorStyle(QDataVis::ColorStyleUniform); } diff --git a/tests/barstest/chart.h b/tests/barstest/chart.h index a9d6119b..7db8f1bd 100644 --- a/tests/barstest/chart.h +++ b/tests/barstest/chart.h @@ -26,6 +26,7 @@ #include #include #include +#include using namespace QtDataVisualization; @@ -33,7 +34,7 @@ class GraphModifier : public QObject { Q_OBJECT public: - explicit GraphModifier(Q3DBars *barchart); + explicit GraphModifier(Q3DBars *barchart, QColorDialog *colorDialog); ~GraphModifier(); void resetTemperatureData(); @@ -74,6 +75,8 @@ public: void releaseAxes(); void releaseProxies(); void createMassiveArray(); + void useOwnTheme(); + void changeBaseColor(const QColor &color); public slots: void flipViews(); @@ -87,7 +90,8 @@ signals: void shadowQualityChanged(int quality); private: - Q3DBars *m_chart; + Q3DBars *m_graph; + QColorDialog *m_colorDialog; int m_columnCount; int m_rowCount; qreal m_xRotation; diff --git a/tests/barstest/main.cpp b/tests/barstest/main.cpp index 158aae15..2644cae9 100644 --- a/tests/barstest/main.cpp +++ b/tests/barstest/main.cpp @@ -31,6 +31,7 @@ #include #include #include +#include int main(int argc, char **argv) { @@ -130,6 +131,12 @@ int main(int argc, char **argv) flipViewsButton->setText(QStringLiteral("Flip views")); flipViewsButton->setEnabled(true); + QPushButton *ownThemeButton = new QPushButton(widget); + ownThemeButton->setText(QStringLiteral("Use own theme")); + ownThemeButton->setEnabled(true); + + QColorDialog *colorDialog = new QColorDialog(widget); + QLinearGradient grBtoY(0, 0, 100, 0); grBtoY.setColorAt(1.0, Qt::black); grBtoY.setColorAt(0.67, Qt::blue); @@ -269,6 +276,8 @@ int main(int argc, char **argv) vLayout->addWidget(releaseAxesButton, 0, Qt::AlignTop); vLayout->addWidget(releaseProxiesButton, 1, Qt::AlignTop); vLayout->addWidget(flipViewsButton, 0, Qt::AlignTop); + vLayout->addWidget(ownThemeButton, 0, Qt::AlignTop); + vLayout->addWidget(colorDialog, 0, Qt::AlignTop); vLayout->addWidget(gradientBtoYPB, 1, Qt::AlignTop); vLayout2->addWidget(staticCheckBox, 0, Qt::AlignTop); @@ -300,7 +309,7 @@ int main(int argc, char **argv) widget->show(); - GraphModifier *modifier = new GraphModifier(widgetchart); + GraphModifier *modifier = new GraphModifier(widgetchart, colorDialog); QObject::connect(rotationSliderX, &QSlider::valueChanged, modifier, &GraphModifier::rotateX); QObject::connect(rotationSliderY, &QSlider::valueChanged, modifier, &GraphModifier::rotateY); @@ -361,6 +370,10 @@ int main(int argc, char **argv) QObject::connect(flipViewsButton, &QPushButton::clicked, modifier, &GraphModifier::flipViews); + QObject::connect(ownThemeButton, &QPushButton::clicked, modifier, + &GraphModifier::useOwnTheme); + QObject::connect(colorDialog, &QColorDialog::currentColorChanged, modifier, + &GraphModifier::changeBaseColor); QObject::connect(gradientBtoYPB, &QPushButton::clicked, modifier, &GraphModifier::setGradient); 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 #include #include +#include #include #include #include @@ -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); diff --git a/tests/qmlcamera/qml/qmlcamera/main.qml b/tests/qmlcamera/qml/qmlcamera/main.qml index 705f284d..5b80abfd 100644 --- a/tests/qmlcamera/qml/qmlcamera/main.qml +++ b/tests/qmlcamera/qml/qmlcamera/main.qml @@ -48,7 +48,7 @@ Item { shadowQuality: Bars3D.ShadowQualityMedium selectionMode: Bars3D.SelectionItem font.pointSize: 35 - theme: Bars3D.ThemeRetro + theme: Theme3D { type: Bars3D.ThemeRetro } labelStyle: Bars3D.LabelStyleFromTheme seriesList: [chartData.series] barThickness: 0.5 diff --git a/tests/scattertest/scatterchart.cpp b/tests/scattertest/scatterchart.cpp index 6b809198..eba69888 100644 --- a/tests/scattertest/scatterchart.cpp +++ b/tests/scattertest/scatterchart.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include using namespace QtDataVisualization; @@ -40,7 +41,7 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter) font.setPointSize(m_fontSize); m_chart->setFont(font); m_chart->setObjectType(QDataVis::MeshStyleSpheres, true); - m_chart->setTheme(QDataVis::ThemeStoneMoss); + m_chart->setTheme(new Q3DTheme(QDataVis::ThemeStoneMoss)); m_chart->setShadowQuality(QDataVis::ShadowQualityNone); m_chart->scene()->activeCamera()->setCameraPreset(QDataVis::CameraPresetFront); m_chart->setAxisX(new Q3DValueAxis); @@ -146,7 +147,7 @@ void ScatterDataModifier::changeTheme() { static int theme = QDataVis::ThemeQt; - m_chart->setTheme((QDataVis::Theme)theme); + m_chart->setTheme(new Q3DTheme(QDataVis::Theme(theme))); if (++theme > QDataVis::ThemeIsabelle) theme = QDataVis::ThemeQt; 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 #include #include +#include #include #include @@ -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 #include #include @@ -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)); -- cgit v1.2.3