diff --git a/demos/chartthemes/themewidget.cpp b/demos/chartthemes/themewidget.cpp index f1713c0..2ad217e 100644 --- a/demos/chartthemes/themewidget.cpp +++ b/demos/chartthemes/themewidget.cpp @@ -158,8 +158,8 @@ QComboBox* ThemeWidget::createThemeBox() const themeComboBox->addItem("Dark", QChart::ChartThemeDark); themeComboBox->addItem("Brown Sand", QChart::ChartThemeBrownSand); themeComboBox->addItem("Blue NCS", QChart::ChartThemeBlueNcs); - themeComboBox->addItem("Icy", QChart::ChartThemeIcy); - themeComboBox->addItem("Scientific", QChart::ChartThemeScientific); + themeComboBox->addItem("High Contrast", QChart::ChartThemeHighContrast); + themeComboBox->addItem("Blue Icy", QChart::ChartThemeBlueIcy); return themeComboBox; } @@ -294,24 +294,25 @@ void ThemeWidget::updateUI() if (theme == QChart::ChartThemeLight) { pal.setColor(QPalette::Window, QRgb(0xf0f0f0)); pal.setColor(QPalette::WindowText, QRgb(0x404044)); - } - else if (theme == QChart::ChartThemeDark) { + } else if (theme == QChart::ChartThemeDark) { pal.setColor(QPalette::Window, QRgb(0x121218)); pal.setColor(QPalette::WindowText, QRgb(0xd6d6d6)); - } - else if (theme == QChart::ChartThemeBlueCerulean) { + } else if (theme == QChart::ChartThemeBlueCerulean) { pal.setColor(QPalette::Window, QRgb(0x40434a)); pal.setColor(QPalette::WindowText, QRgb(0xd6d6d6)); - } - else if (theme == QChart::ChartThemeBrownSand) { + } else if (theme == QChart::ChartThemeBrownSand) { pal.setColor(QPalette::Window, QRgb(0x9e8965)); pal.setColor(QPalette::WindowText, QRgb(0x404044)); - } - else if (theme == QChart::ChartThemeBlueNcs) { + } else if (theme == QChart::ChartThemeBlueNcs) { pal.setColor(QPalette::Window, QRgb(0x018bba)); pal.setColor(QPalette::WindowText, QRgb(0x404044)); - } - else { + } else if (theme == QChart::ChartThemeHighContrast) { + pal.setColor(QPalette::Window, QRgb(0xffab03)); + pal.setColor(QPalette::WindowText, QRgb(0x181818)); + } else if (theme == QChart::ChartThemeBlueIcy) { + pal.setColor(QPalette::Window, QRgb(0xcee7f0)); + pal.setColor(QPalette::WindowText, QRgb(0x404044)); + } else { pal.setColor(QPalette::Window, QRgb(0xf0f0f0)); pal.setColor(QPalette::WindowText, QRgb(0x404044)); } diff --git a/demos/piechartcustomization/main.cpp b/demos/piechartcustomization/main.cpp index 65a8e24..e4638fb 100644 --- a/demos/piechartcustomization/main.cpp +++ b/demos/piechartcustomization/main.cpp @@ -309,8 +309,8 @@ public: m_themeComboBox->addItem("Dark", QChart::ChartThemeDark); m_themeComboBox->addItem("BrownSand", QChart::ChartThemeBrownSand); m_themeComboBox->addItem("BlueNcs", QChart::ChartThemeBlueNcs); - m_themeComboBox->addItem("Icy", QChart::ChartThemeIcy); - m_themeComboBox->addItem("Scientific", QChart::ChartThemeScientific); + m_themeComboBox->addItem("High Contrast", QChart::ChartThemeHighContrast); + m_themeComboBox->addItem("Blue Icy", QChart::ChartThemeBlueIcy); m_aaCheckBox = new QCheckBox(); m_animationsCheckBox = new QCheckBox(); diff --git a/examples/chartview/main.cpp b/examples/chartview/main.cpp index 68abd23..f9e5a80 100644 --- a/examples/chartview/main.cpp +++ b/examples/chartview/main.cpp @@ -31,7 +31,7 @@ int main(int argc, char *argv[]) chartView->setChartTitle("\'Scietific\' theme"); //! [2] // Change theme - chartView->setChartTheme(QChart::ChartThemeScientific); + chartView->setChartTheme(QChart::ChartThemeHighContrast); //! [2] chartView->setChartTitle("Simple Pie Chart"); diff --git a/examples/customcolors/mainwindow.cpp b/examples/customcolors/mainwindow.cpp index 50da308..3955597 100644 --- a/examples/customcolors/mainwindow.cpp +++ b/examples/customcolors/mainwindow.cpp @@ -24,7 +24,7 @@ MainWindow::MainWindow(QWidget *parent) // Create chart view //! [4] m_chartView = new QChartView(this); - m_chartView->setChartTheme(QChart::ChartThemeScientific); + m_chartView->setChartTheme(QChart::ChartThemeHighContrast); //! [4] setCentralWidget(m_chartView); m_chartView->setChartTitle("Custom colors example"); diff --git a/examples/percentbarchart/main.cpp b/examples/percentbarchart/main.cpp index 5fbaf11..b32fce9 100644 --- a/examples/percentbarchart/main.cpp +++ b/examples/percentbarchart/main.cpp @@ -74,7 +74,7 @@ int main(int argc, char *argv[]) series->addBarSet(set2); series->addBarSet(set3); series->addBarSet(set4); -//! [3] +//![3] //![4] QChart* chart = new QChart(); chart->addSeries(series); diff --git a/examples/stackedbarchartdrilldown/main.cpp b/examples/stackedbarchartdrilldown/main.cpp index a32483b..461d639 100644 --- a/examples/stackedbarchartdrilldown/main.cpp +++ b/examples/stackedbarchartdrilldown/main.cpp @@ -70,7 +70,7 @@ int main(int argc, char *argv[]) QMainWindow window; DrilldownChart* drilldownChart = new DrilldownChart(&window); - drilldownChart->setChartTheme(QChart::ChartThemeIcy); + drilldownChart->setChartTheme(QChart::ChartThemeBlueIcy); //! [3] // Define categories diff --git a/qmlplugin/declarativechart.h b/qmlplugin/declarativechart.h index f9a7ce4..474f883 100644 --- a/qmlplugin/declarativechart.h +++ b/qmlplugin/declarativechart.h @@ -23,8 +23,8 @@ public: ThemeDark, ThemeBrownSand, ThemeBlueNcs, - ThemeIcy, - ThemeScientific + ThemeHighContrast, + ThemeBlueIcy }; DeclarativeChart(QDeclarativeItem *parent = 0); ~DeclarativeChart(); diff --git a/src/charttheme.cpp b/src/charttheme.cpp index 28f6f45..9b13110 100644 --- a/src/charttheme.cpp +++ b/src/charttheme.cpp @@ -35,8 +35,8 @@ #include "chartthemedark_p.h" #include "chartthemebrownsand_p.h" #include "chartthemebluencs_p.h" -#include "chartthemeicy_p.h" -#include "chartthemescientific_p.h" +#include "chartthemehighcontrast_p.h" +#include "chartthemeblueicy_p.h" QTCOMMERCIALCHART_BEGIN_NAMESPACE @@ -69,10 +69,10 @@ ChartTheme* ChartTheme::createTheme(QChart::ChartTheme theme) return new ChartThemeBrownSand(); case QChart::ChartThemeBlueNcs: return new ChartThemeBlueNcs(); - case QChart::ChartThemeIcy: - return new ChartThemeIcy(); - case QChart::ChartThemeScientific: - return new ChartThemeScientific(); + case QChart::ChartThemeHighContrast: + return new ChartThemeHighContrast(); + case QChart::ChartThemeBlueIcy: + return new ChartThemeBlueIcy(); default: return new ChartThemeDefault(); } @@ -80,18 +80,10 @@ ChartTheme* ChartTheme::createTheme(QChart::ChartTheme theme) void ChartTheme::decorate(QChart* chart,bool force) { - QPen pen; QBrush brush; if(brush == chart->backgroundBrush() || force) - { - if (m_backgroundShades == BackgroundShadesNone) { - chart->setBackgroundBrush(m_chartBackgroundGradient); - } - else { - chart->setBackgroundBrush(Qt::NoBrush); - } - } + chart->setBackgroundBrush(m_chartBackgroundGradient); chart->setTitleFont(m_masterFont); chart->setTitleBrush(m_titleBrush); } diff --git a/src/qchart.cpp b/src/qchart.cpp index bf1e7d8..1f1f939 100644 --- a/src/qchart.cpp +++ b/src/qchart.cpp @@ -36,8 +36,8 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE \value ChartThemeDark \value ChartThemeBrownSand \value ChartThemeBlueNcs - \value ChartThemeIcy - \value ChartThemeScientific + \value ChartThemeHighContrast + \value ChartThemeBlueIcy \value ChartThemeCount Not really a theme; the total count of themes. */ diff --git a/src/qchart.h b/src/qchart.h index 5027414..3a81112 100644 --- a/src/qchart.h +++ b/src/qchart.h @@ -44,8 +44,8 @@ public: ChartThemeDark, ChartThemeBrownSand, ChartThemeBlueNcs, - ChartThemeIcy, - ChartThemeScientific, + ChartThemeHighContrast, + ChartThemeBlueIcy, ChartThemeCount }; diff --git a/src/themes/chartthemeicy_p.h b/src/themes/chartthemeblueicy_p.h similarity index 53% rename from src/themes/chartthemeicy_p.h rename to src/themes/chartthemeblueicy_p.h index b36127a..01e360a 100644 --- a/src/themes/chartthemeicy_p.h +++ b/src/themes/chartthemeblueicy_p.h @@ -2,31 +2,33 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE -class ChartThemeIcy: public ChartTheme +class ChartThemeBlueIcy: public ChartTheme { public: - ChartThemeIcy() : ChartTheme(QChart::ChartThemeIcy) + ChartThemeBlueIcy() : ChartTheme(QChart::ChartThemeBlueIcy) { - // Series - m_seriesColors << QRgb(0x0d2673); + // Series colors + m_seriesColors << QRgb(0x3daeda); m_seriesColors << QRgb(0x2685bf); - m_seriesColors << QRgb(0x3dadd9); - m_seriesColors << QRgb(0x62c3d9); + m_seriesColors << QRgb(0x0c2673); + m_seriesColors << QRgb(0x5f3dba); + m_seriesColors << QRgb(0x2fa3b4); generateSeriesGradients(); // Background - QLinearGradient backgroundGradient; - backgroundGradient.setColorAt(0.0, QRgb(0xebebeb)); - backgroundGradient.setColorAt(1.0, QRgb(0xf8f9fb)); + QLinearGradient backgroundGradient(0.5, 0.0, 0.5, 1.0); + backgroundGradient.setColorAt(0.0, QRgb(0xffffff)); + backgroundGradient.setColorAt(1.0, QRgb(0xffffff)); backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode); m_chartBackgroundGradient = backgroundGradient; // Axes and other - m_axisLinePen = QPen(QRgb(0x0f0f0f)); + m_titleBrush = QBrush(QRgb(0x404044)); + m_axisLinePen = QPen(QRgb(0xd6d6d6)); m_axisLinePen.setWidth(2); - m_axisLabelBrush = QBrush(QRgb(0x3f3f3f)); - m_gridLinePen = QPen(QRgb(0x0f0f0f)); - m_gridLinePen.setWidth(2); + m_axisLabelBrush = QBrush(QRgb(0x404044)); + m_gridLinePen = QPen(QRgb(0xe2e2e2)); + m_gridLinePen.setWidth(1); m_backgroundShades = BackgroundShadesNone; } }; diff --git a/src/themes/chartthemescientific_p.h b/src/themes/chartthemehighcontrast_p.h similarity index 51% rename from src/themes/chartthemescientific_p.h rename to src/themes/chartthemehighcontrast_p.h index d52f166..f8d4e36 100644 --- a/src/themes/chartthemescientific_p.h +++ b/src/themes/chartthemehighcontrast_p.h @@ -2,32 +2,34 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE -class ChartThemeScientific: public ChartTheme +class ChartThemeHighContrast : public ChartTheme { public: - ChartThemeScientific() : ChartTheme(QChart::ChartThemeScientific) + ChartThemeHighContrast() : ChartTheme(QChart::ChartThemeHighContrast) { - // Series - m_seriesColors << QRgb(0xFFAD00); - m_seriesColors << QRgb(0x596A75); + // Series colors m_seriesColors << QRgb(0x202020); - m_seriesColors << QRgb(0x474747); + m_seriesColors << QRgb(0x596a74); + m_seriesColors << QRgb(0xffab03); + m_seriesColors << QRgb(0x038e9b); + m_seriesColors << QRgb(0xff4a41); generateSeriesGradients(); // Background - QLinearGradient backgroundGradient; - backgroundGradient.setColorAt(0.0, QRgb(0xfffefc)); - backgroundGradient.setColorAt(1.0, QRgb(0xfffefc)); + QLinearGradient backgroundGradient(0.5, 0.0, 0.5, 1.0); + backgroundGradient.setColorAt(0.0, QRgb(0xffffff)); + backgroundGradient.setColorAt(1.0, QRgb(0xffffff)); backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode); m_chartBackgroundGradient = backgroundGradient; // Axes and other - m_axisLinePen = QPen(QRgb(0x0f0f0f)); + m_titleBrush = QBrush(QRgb(0x181818)); + m_axisLinePen = QPen(QRgb(0x8c8c8c)); m_axisLinePen.setWidth(2); - m_axisLabelBrush = QBrush(QRgb(0x3f3f3f)); - m_gridLinePen = QPen(QRgb(0x0f0f0f)); - m_gridLinePen.setWidth(2); - m_backgroundShadesBrush = QBrush(QColor(0xff, 0xad, 0x00, 0x50)); + m_axisLabelBrush = QBrush(QRgb(0x181818)); + m_gridLinePen = QPen(QRgb(0x8c8c8c)); + m_gridLinePen.setWidth(1); + m_backgroundShadesBrush = QBrush(QRgb(0xffeecd)); m_backgroundShades = BackgroundShadesHorizontal; } }; diff --git a/src/themes/themes.pri b/src/themes/themes.pri index c2f7030..5d39cd9 100644 --- a/src/themes/themes.pri +++ b/src/themes/themes.pri @@ -8,5 +8,5 @@ THEMES += \ $$PWD/chartthemedark_p.h \ $$PWD/chartthemebrownsand_p.h \ $$PWD/chartthemebluencs_p.h \ - $$PWD/chartthemeicy_p.h \ - $$PWD/chartthemescientific_p.h \ No newline at end of file + $$PWD/chartthemehighcontrast_p.h \ + $$PWD/chartthemeblueicy_p.h diff --git a/test/chartwidgettest/mainwidget.cpp b/test/chartwidgettest/mainwidget.cpp index 04ca0e5..b600189 100644 --- a/test/chartwidgettest/mainwidget.cpp +++ b/test/chartwidgettest/mainwidget.cpp @@ -120,8 +120,8 @@ void MainWidget::initThemeCombo(QGridLayout *grid) chartTheme->addItem("Dark"); chartTheme->addItem("Brown Sand"); chartTheme->addItem("Blue NCS"); - chartTheme->addItem("Icy"); - chartTheme->addItem("Scientific"); + chartTheme->addItem("High Contrast"); + chartTheme->addItem("Blue Icy"); connect(chartTheme, SIGNAL(currentIndexChanged(int)), this, SLOT(changeChartTheme(int))); grid->addWidget(new QLabel("Chart theme:"), 8, 0);