diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-02 11:42:39 +0300 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-02 12:04:20 +0300 |
commit | 03a6fa33bce2459d12e906ab3c01a37d66a74942 (patch) | |
tree | 9d78c94581fdae71bf90753c800705ce19753ec6 /tests/barstest | |
parent | e4ae069de4b69856771a804926f23d3644599d99 (diff) |
Refactored LabelTransparency
and ShadowQuality
Task-number: QTRD-2362
Change-Id: I4c9cc84d44a2fcf881e8b6062413aa3dbe2e5890
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'tests/barstest')
-rw-r--r-- | tests/barstest/chart.cpp | 12 | ||||
-rw-r--r-- | tests/barstest/chart.h | 2 | ||||
-rw-r--r-- | tests/barstest/main.cpp | 2 |
3 files changed, 8 insertions, 8 deletions
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); |