HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r757:7dda437b6dfe

Added Icy Blue and High Contrast theme

Tero Ahola -

r757:7dda437b6dfe

parent child

Context file:

r757:7dda437b6dfe

Collapse all files

demos/chartthemes/themewidget.cpp +13 -12

                 themeComboBox->addItem("Dark", QChart::ChartThemeDark);
                 themeComboBox->addItem("Brown Sand", QChart::ChartThemeBrownSand);
                 themeComboBox->addItem("Blue NCS", QChart::ChartThemeBlueNcs);
-                themeComboBox->addItem("Icy", QChart::ChartThemeIcy);
+                themeComboBox->addItem("High Contrast", QChart::ChartThemeHighContrast);
-                themeComboBox->addItem("Scientific", QChart::ChartThemeScientific);
+                themeComboBox->addItem("Blue Icy", QChart::ChartThemeBlueIcy);
                 return themeComboBox;
             }
                     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 if (theme == QChart::ChartThemeHighContrast) {
-                    else {
+                        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));
                     }

demos/piechartcustomization/main.cpp +2 -2

                     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("High Contrast", QChart::ChartThemeHighContrast);
-                    m_themeComboBox->addItem("Scientific", QChart::ChartThemeScientific);
+                    m_themeComboBox->addItem("Blue Icy", QChart::ChartThemeBlueIcy);
                     m_aaCheckBox = new QCheckBox();
                     m_animationsCheckBox = new QCheckBox();

examples/chartview/main.cpp +1 -1

                 chartView->setChartTitle("\'Scietific\' theme");
                 //! [2]
                 // Change theme
-                chartView->setChartTheme(QChart::ChartThemeScientific);
+                chartView->setChartTheme(QChart::ChartThemeHighContrast);
                 //! [2]
                 chartView->setChartTitle("Simple Pie Chart");

examples/customcolors/mainwindow.cpp +1 -1

                 // 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");

examples/percentbarchart/main.cpp +1 -1

                 series->addBarSet(set2);
                 series->addBarSet(set3);
                 series->addBarSet(set4);
-            //! [3]
+            //![3]
             //![4]
                 QChart* chart = new QChart();
                 chart->addSeries(series);

examples/stackedbarchartdrilldown/main.cpp +1 -1

                 QMainWindow window;
                 DrilldownChart* drilldownChart =  new DrilldownChart(&window);
-                drilldownChart->setChartTheme(QChart::ChartThemeIcy);
+                drilldownChart->setChartTheme(QChart::ChartThemeBlueIcy);
                 //! [3]
                 // Define categories

qmlplugin/declarativechart.h +2 -2

                     ThemeDark,
                     ThemeBrownSand,
                     ThemeBlueNcs,
-                    ThemeIcy,
+                    ThemeHighContrast,
-                    ThemeScientific
+                    ThemeBlueIcy
                 };
                 DeclarativeChart(QDeclarativeItem *parent = 0);
                 ~DeclarativeChart();

src/charttheme.cpp +7 -15

             #include "chartthemedark_p.h"
             #include "chartthemebrownsand_p.h"
             #include "chartthemebluencs_p.h"
-            #include "chartthemeicy_p.h"
+            #include "chartthemehighcontrast_p.h"
-            #include "chartthemescientific_p.h"
+            #include "chartthemeblueicy_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                         return new ChartThemeBrownSand();
                     case QChart::ChartThemeBlueNcs:
                         return new ChartThemeBlueNcs();
-                    case QChart::ChartThemeIcy:
+                    case QChart::ChartThemeHighContrast:
-                        return new ChartThemeIcy();
+                        return new ChartThemeHighContrast();
-                    case QChart::ChartThemeScientific:
+                    case QChart::ChartThemeBlueIcy:
-                        return new ChartThemeScientific();
+                        return new ChartThemeBlueIcy();
                     default:
                         return new ChartThemeDefault();
                 }
             void ChartTheme::decorate(QChart* chart,bool force)
             {
-                QPen pen;
                 QBrush brush;
                 if(brush == chart->backgroundBrush() || force)
+                    chart->setBackgroundBrush(m_chartBackgroundGradient);
-                    if (m_backgroundShades == BackgroundShadesNone) {
-                        chart->setBackgroundBrush(m_chartBackgroundGradient);
-                    else {
-                        chart->setBackgroundBrush(Qt::NoBrush);
                 chart->setTitleFont(m_masterFont);
                 chart->setTitleBrush(m_titleBrush);
             }

src/qchart.cpp +2 -2

              \value ChartThemeDark
              \value ChartThemeBrownSand
              \value ChartThemeBlueNcs
-             \value ChartThemeIcy
+             \value ChartThemeHighContrast
-             \value ChartThemeScientific
+             \value ChartThemeBlueIcy
              \value ChartThemeCount Not really a theme; the total count of themes.
              */

src/qchart.h +2 -2

                     ChartThemeDark,
                     ChartThemeBrownSand,
                     ChartThemeBlueNcs,
-                    ChartThemeIcy,
+                    ChartThemeHighContrast,
-                    ChartThemeScientific,
+                    ChartThemeBlueIcy,
                     ChartThemeCount
                 };

src/themes/chartthemeblueicy_p.h ~~src/themes/chartthemeicy_p.h~~ renamed +15 -13

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class ChartThemeIcy: public ChartTheme
+            class ChartThemeBlueIcy: public ChartTheme
             {
             public:
-                ChartThemeIcy() : ChartTheme(QChart::ChartThemeIcy)
+                ChartThemeBlueIcy() : ChartTheme(QChart::ChartThemeBlueIcy)
                 {
-                    // Series
+                    // Series colors
-                    m_seriesColors << QRgb(0x0d2673);
+                    m_seriesColors << QRgb(0x3daeda);
                     m_seriesColors << QRgb(0x2685bf);
-                    m_seriesColors << QRgb(0x3dadd9);
+                    m_seriesColors << QRgb(0x0c2673);
-                    m_seriesColors << QRgb(0x62c3d9);
+                    m_seriesColors << QRgb(0x5f3dba);
+                    m_seriesColors << QRgb(0x2fa3b4);
                     generateSeriesGradients();
                     // Background
-                    QLinearGradient backgroundGradient;
+                    QLinearGradient backgroundGradient(0.5, 0.0, 0.5, 1.0);
-                    backgroundGradient.setColorAt(0.0, QRgb(0xebebeb));
+                    backgroundGradient.setColorAt(0.0, QRgb(0xffffff));
-                    backgroundGradient.setColorAt(1.0, QRgb(0xf8f9fb));
+                    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_axisLabelBrush = QBrush(QRgb(0x404044));
-                    m_gridLinePen = QPen(QRgb(0x0f0f0f));
+                    m_gridLinePen = QPen(QRgb(0xe2e2e2));
-                    m_gridLinePen.setWidth(2);
+                    m_gridLinePen.setWidth(1);
                     m_backgroundShades = BackgroundShadesNone;
                 }
             };

src/themes/chartthemehighcontrast_p.h ~~src/themes/chartthemescientific_p.h~~ renamed +16 -14

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class ChartThemeScientific: public ChartTheme
+            class ChartThemeHighContrast : public ChartTheme
             {
             public:
-                ChartThemeScientific() : ChartTheme(QChart::ChartThemeScientific)
+                ChartThemeHighContrast() : ChartTheme(QChart::ChartThemeHighContrast)
                 {
-                    // Series
+                    // Series colors
-                    m_seriesColors << QRgb(0xFFAD00);
-                    m_seriesColors << QRgb(0x596A75);
                     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;
+                    QLinearGradient backgroundGradient(0.5, 0.0, 0.5, 1.0);
-                    backgroundGradient.setColorAt(0.0, QRgb(0xfffefc));
+                    backgroundGradient.setColorAt(0.0, QRgb(0xffffff));
-                    backgroundGradient.setColorAt(1.0, QRgb(0xfffefc));
+                    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_axisLabelBrush = QBrush(QRgb(0x181818));
-                    m_gridLinePen = QPen(QRgb(0x0f0f0f));
+                    m_gridLinePen = QPen(QRgb(0x8c8c8c));
-                    m_gridLinePen.setWidth(2);
+                    m_gridLinePen.setWidth(1);
-                    m_backgroundShadesBrush = QBrush(QColor(0xff, 0xad, 0x00, 0x50));
+                    m_backgroundShadesBrush = QBrush(QRgb(0xffeecd));
                     m_backgroundShades = BackgroundShadesHorizontal;
                 }
             };

src/themes/themes.pri +2 -2

                 $$PWD/chartthemedark_p.h \
                 $$PWD/chartthemebrownsand_p.h \
                 $$PWD/chartthemebluencs_p.h \
-                $$PWD/chartthemeicy_p.h \
+                $$PWD/chartthemehighcontrast_p.h \
-                $$PWD/chartthemescientific_p.h
  No newline at end of file
+                $$PWD/chartthemeblueicy_p.h

test/chartwidgettest/mainwidget.cpp +2 -2

                 chartTheme->addItem("Dark");
                 chartTheme->addItem("Brown Sand");
                 chartTheme->addItem("Blue NCS");
-                chartTheme->addItem("Icy");
+                chartTheme->addItem("High Contrast");
-                chartTheme->addItem("Scientific");
+                chartTheme->addItem("Blue Icy");
                 connect(chartTheme, SIGNAL(currentIndexChanged(int)),
                         this, SLOT(changeChartTheme(int)));
                 grid->addWidget(new QLabel("Chart theme:"), 8, 0);

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages