From 03a6fa33bce2459d12e906ab3c01a37d66a74942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Wed, 2 Oct 2013 11:42:39 +0300 Subject: Refactored LabelTransparency and ShadowQuality Task-number: QTRD-2362 Change-Id: I4c9cc84d44a2fcf881e8b6062413aa3dbe2e5890 Reviewed-by: Miikka Heikkinen --- tests/barstest/chart.cpp | 12 ++++++------ tests/barstest/chart.h | 2 +- tests/barstest/main.cpp | 2 +- tests/kinectsurface/surfacedata.cpp | 4 ++-- tests/scattertest/main.cpp | 2 +- tests/scattertest/scatterchart.cpp | 12 ++++++------ tests/scattertest/scatterchart.h | 2 +- tests/spectrum/spectrumapp/main.cpp | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) (limited to 'tests') diff --git a/tests/barstest/chart.cpp b/tests/barstest/chart.cpp index 89c472fa..d07b87f4 100644 --- a/tests/barstest/chart.cpp +++ b/tests/barstest/chart.cpp @@ -103,7 +103,7 @@ ChartModifier::ChartModifier(Q3DBars *barchart) m_chart->addAxis(m_genericRowAxis); m_chart->addAxis(m_genericColumnAxis); - m_chart->setShadowQuality(QDataVis::ShadowSoftMedium); + m_chart->setShadowQuality(QDataVis::ShadowQualitySoftMedium); m_temperatureData->setItemLabelFormat(QStringLiteral("@valueTitle for @colLabel @rowLabel: @valueLabel")); m_genericData->setItemLabelFormat(QStringLiteral("@valueTitle for (@rowIdx, @colIdx): @valueLabel")); @@ -461,14 +461,14 @@ void ChartModifier::changeTheme() theme = QDataVis::ThemeQt; } -void ChartModifier::changeTransparency() +void ChartModifier::changeLabelStyle() { - static int transparency = QDataVis::TransparencyNone; + static int style = QDataVis::LabelStyleOpaque; - m_chart->setLabelTransparency((QDataVis::LabelTransparency)transparency); + m_chart->setLabelStyle((QDataVis::LabelStyle)style); - if (++transparency > QDataVis::TransparencyNoBackground) - transparency = QDataVis::TransparencyNone; + if (++style > QDataVis::LabelStyleTransparent) + style = QDataVis::LabelStyleOpaque; } void ChartModifier::changeSelectionMode() diff --git a/tests/barstest/chart.h b/tests/barstest/chart.h index 8c8d9b81..a2538b1c 100644 --- a/tests/barstest/chart.h +++ b/tests/barstest/chart.h @@ -48,7 +48,7 @@ public: void changeStyle(); void changePresetCamera(); void changeTheme(); - void changeTransparency(); + void changeLabelStyle(); void changeSelectionMode(); void changeFont(const QFont &font); void changeFontSize(int fontsize); diff --git a/tests/barstest/main.cpp b/tests/barstest/main.cpp index 0dd61c1d..ca98688c 100644 --- a/tests/barstest/main.cpp +++ b/tests/barstest/main.cpp @@ -298,7 +298,7 @@ int main(int argc, char **argv) &ChartModifier::changePresetCamera); QObject::connect(themeButton, &QPushButton::clicked, modifier, &ChartModifier::changeTheme); QObject::connect(labelButton, &QPushButton::clicked, modifier, - &ChartModifier::changeTransparency); + &ChartModifier::changeStyle); QObject::connect(addDataButton, &QPushButton::clicked, modifier, &ChartModifier::addRow); QObject::connect(addMultiDataButton, &QPushButton::clicked, modifier, &ChartModifier::addRows); QObject::connect(insertDataButton, &QPushButton::clicked, modifier, &ChartModifier::insertRow); diff --git a/tests/kinectsurface/surfacedata.cpp b/tests/kinectsurface/surfacedata.cpp index 84f05ed8..28022a4e 100644 --- a/tests/kinectsurface/surfacedata.cpp +++ b/tests/kinectsurface/surfacedata.cpp @@ -60,7 +60,7 @@ SurfaceData::SurfaceData(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars m_scatter->setSelectionMode(QDataVis::ModeNone); m_scatter->setGridVisible(false); m_scatter->setObjectType(QDataVis::Dots, false); - m_scatter->setShadowQuality(QDataVis::ShadowSoftLow); + m_scatter->setShadowQuality(QDataVis::ShadowQualitySoftLow); m_scatter->setCameraPosition(0.0, 85.0, 110); m_scatter->axisY()->setMin(-128); m_scatter->axisY()->setMax(128); @@ -75,7 +75,7 @@ SurfaceData::SurfaceData(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars m_bars->setGridVisible(false); m_bars->setBarType(QDataVis::Bars, true); #if 1 - m_bars->setShadowQuality(QDataVis::ShadowLow); + m_bars->setShadowQuality(QDataVis::ShadowQualityLow); #else m_bars->setBarSpacing(QSizeF(0.0, 0.0)); #endif diff --git a/tests/scattertest/main.cpp b/tests/scattertest/main.cpp index 933ae58e..35ba228d 100644 --- a/tests/scattertest/main.cpp +++ b/tests/scattertest/main.cpp @@ -184,7 +184,7 @@ int main(int argc, char **argv) QObject::connect(themeButton, &QPushButton::clicked, modifier, &ScatterDataModifier::changeTheme); QObject::connect(labelButton, &QPushButton::clicked, modifier, - &ScatterDataModifier::changeTransparency); + &ScatterDataModifier::changeStyle); QObject::connect(shadowQuality, SIGNAL(currentIndexChanged(int)), modifier, SLOT(changeShadowQuality(int))); diff --git a/tests/scattertest/scatterchart.cpp b/tests/scattertest/scatterchart.cpp index 7c45a336..a0b56753 100644 --- a/tests/scattertest/scatterchart.cpp +++ b/tests/scattertest/scatterchart.cpp @@ -36,7 +36,7 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter) m_chart->setFont(font); m_chart->setObjectType(QDataVis::Spheres, true); m_chart->setTheme(QDataVis::ThemeStoneMoss); - m_chart->setShadowQuality(QDataVis::ShadowHigh); + m_chart->setShadowQuality(QDataVis::ShadowQualityHigh); m_chart->setCameraPreset(QDataVis::PresetFront); m_chart->setAxisX(new Q3DValueAxis); m_chart->setAxisY(new Q3DValueAxis); @@ -133,14 +133,14 @@ void ScatterDataModifier::changeTheme() theme = QDataVis::ThemeQt; } -void ScatterDataModifier::changeTransparency() +void ScatterDataModifier::changeLabelStyle() { - static int transparency = QDataVis::TransparencyNone; + static int style = QDataVis::LabelStyleOpaque; - m_chart->setLabelTransparency((QDataVis::LabelTransparency)transparency); + m_chart->setLabelStyle((QDataVis::LabelStyle)style); - if (++transparency > QDataVis::TransparencyNoBackground) - transparency = QDataVis::TransparencyNone; + if (++style > QDataVis::LabelStyleTransparent) + style = QDataVis::LabelStyleOpaque; } void ScatterDataModifier::changeFont(const QFont &font) diff --git a/tests/scattertest/scatterchart.h b/tests/scattertest/scatterchart.h index eef94ac4..7132e7ce 100644 --- a/tests/scattertest/scatterchart.h +++ b/tests/scattertest/scatterchart.h @@ -38,7 +38,7 @@ public: void changeStyle(); void changePresetCamera(); void changeTheme(); - void changeTransparency(); + void changeLabelStyle(); void changeFont(const QFont &font); void changeFontSize(int fontsize); void setBackgroundEnabled(int enabled); diff --git a/tests/spectrum/spectrumapp/main.cpp b/tests/spectrum/spectrumapp/main.cpp index c6e2e04f..7fbd92d5 100644 --- a/tests/spectrum/spectrumapp/main.cpp +++ b/tests/spectrum/spectrumapp/main.cpp @@ -74,7 +74,7 @@ MainApp::MainApp(Q3DBars *window) // Disable auto-scaling of height by defining explicit range m_chart->valueAxis()->setRange(0.0, 1.0); // Disable shadows - m_chart->setShadowQuality(QDataVis::ShadowNone); + m_chart->setShadowQuality(QDataVis::ShadowQualityNone); #if USE_CONES // Set bar specifications; make them a bit wider than deep and make them be drawn 75% // inside each other -- cgit v1.2.3