diff options
| -rw-r--r-- | src/datavisualization/theme/thememanager.cpp | 20 | ||||
| -rw-r--r-- | tests/barstest/chart.cpp | 37 |
2 files changed, 46 insertions, 11 deletions
diff --git a/src/datavisualization/theme/thememanager.cpp b/src/datavisualization/theme/thememanager.cpp index b3986cff..cc5362ef 100644 --- a/src/datavisualization/theme/thememanager.cpp +++ b/src/datavisualization/theme/thememanager.cpp @@ -137,7 +137,7 @@ void ThemeManager::useTheme(Q3DTheme::Theme type) baseColors.append(QColor(QRgb(0xffe400))); baseColors.append(QColor(QRgb(0xfaa106))); baseColors.append(QColor(QRgb(0xf45f0d))); - baseColors.append(QColor(QRgb(0xfcc303))); + baseColors.append(QColor(QRgb(0xfcba04))); baseColors.append(QColor(QRgb(0xf7800a))); QList<QLinearGradient> baseGradients; @@ -173,7 +173,7 @@ void ThemeManager::useTheme(Q3DTheme::Theme type) case Q3DTheme::ThemeDigia: { QList<QColor> baseColors; - baseColors.append(QColor(QRgb(0xdddddd))); + baseColors.append(QColor(QRgb(0xeaeaea))); baseColors.append(QColor(QRgb(0xa0a0a0))); baseColors.append(QColor(QRgb(0x626262))); baseColors.append(QColor(QRgb(0xbebebe))); @@ -213,10 +213,10 @@ void ThemeManager::useTheme(Q3DTheme::Theme type) case Q3DTheme::ThemeStoneMoss: { QList<QColor> baseColors; baseColors.append(QColor(QRgb(0xbeb32b))); - baseColors.append(QColor(QRgb(0x978927))); - baseColors.append(QColor(QRgb(0x705f24))); - baseColors.append(QColor(QRgb(0xaa9e29))); - baseColors.append(QColor(QRgb(0x847426))); + baseColors.append(QColor(QRgb(0x928327))); + baseColors.append(QColor(QRgb(0x665423))); + baseColors.append(QColor(QRgb(0xa69929))); + baseColors.append(QColor(QRgb(0x7c6c25))); QList<QLinearGradient> baseGradients; baseGradients.append(createGradient(baseColors.at(0), defaultColorLevel)); @@ -330,10 +330,10 @@ void ThemeManager::useTheme(Q3DTheme::Theme type) case Q3DTheme::ThemeEbony: { QList<QColor> baseColors; baseColors.append(QColor(QRgb(0xffffff))); - baseColors.append(QColor(QRgb(0xb3b3b3))); - baseColors.append(QColor(QRgb(0x666666))); - baseColors.append(QColor(QRgb(0xd9d9d9))); - baseColors.append(QColor(QRgb(0x8c8c8c))); + baseColors.append(QColor(QRgb(0x999999))); + baseColors.append(QColor(QRgb(0x474747))); + baseColors.append(QColor(QRgb(0xc7c7c7))); + baseColors.append(QColor(QRgb(0x6b6b6b))); QList<QLinearGradient> baseGradients; baseGradients.append(createGradient(baseColors.at(0), defaultColorLevel)); diff --git a/tests/barstest/chart.cpp b/tests/barstest/chart.cpp index 00a64773..8bef7479 100644 --- a/tests/barstest/chart.cpp +++ b/tests/barstest/chart.cpp @@ -578,6 +578,36 @@ void GraphModifier::changeTheme() m_graph->setTheme(new Q3DTheme((Q3DTheme::Theme)theme)); + switch (theme) { + case Q3DTheme::ThemeQt: + qDebug() << __FUNCTION__ << "ThemeQt"; + break; + case Q3DTheme::ThemePrimaryColors: + qDebug() << __FUNCTION__ << "ThemePrimaryColors"; + break; + case Q3DTheme::ThemeDigia: + qDebug() << __FUNCTION__ << "ThemeDigia"; + break; + case Q3DTheme::ThemeStoneMoss: + qDebug() << __FUNCTION__ << "ThemeStoneMoss"; + break; + case Q3DTheme::ThemeArmyBlue: + qDebug() << __FUNCTION__ << "ThemeArmyBlue"; + break; + case Q3DTheme::ThemeRetro: + qDebug() << __FUNCTION__ << "ThemeRetro"; + break; + case Q3DTheme::ThemeEbony: + qDebug() << __FUNCTION__ << "ThemeEbony"; + break; + case Q3DTheme::ThemeIsabelle: + qDebug() << __FUNCTION__ << "ThemeIsabelle"; + break; + default: + qDebug() << __FUNCTION__ << "Unknown theme"; + break; + } + if (++theme > Q3DTheme::ThemeIsabelle) theme = Q3DTheme::ThemeQt; } @@ -658,6 +688,7 @@ void GraphModifier::showFiveSeries() { releaseProxies(); releaseAxes(); + m_graph->setSelectionMode(QDataVis::SelectionItemRowAndColumn | QDataVis::SelectionMultiSeries); m_dummyData->dataProxy()->resetArray(makeDummyData(), QStringList(), QStringList()); m_dummyData2->dataProxy()->resetArray(makeDummyData(), QStringList(), QStringList()); @@ -669,7 +700,11 @@ void GraphModifier::showFiveSeries() m_graph->addSeries(m_dummyData2); m_graph->addSeries(m_dummyData3); m_graph->addSeries(m_dummyData4); - m_graph->addSeries(m_dummyData5); + + // Toggle between four and five series + static int count = 0; + if (++count % 2) + m_graph->addSeries(m_dummyData5); } QBarDataArray *GraphModifier::makeDummyData() |