HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r584:bcc474698f6b

New theme with light colors, chartview background

Tero Ahola -

r584:bcc474698f6b

parent child

Context file:

r584:bcc474698f6b

Collapse all files

src/themes/chartthemelight_p.h created 644 +36 0

@@ -0,0 +1,36
	1	#include "charttheme_p.h"
	2
	3	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	4
	5	class ChartThemeLight: public ChartTheme
	6	{
	7	public:
	8	ChartThemeLight() : ChartTheme(QChart::ChartThemeLight)
	9	{
	10	// Series colors
	11	m_seriesColors << QRgb(0x1c9dde);
	12	m_seriesColors << QRgb(0xf7a015);
	13	m_seriesColors << QRgb(0x8dc444);
	14	generateSeriesGradients();
	15
	16	// Background
	17	QLinearGradient backgroundGradient;
	18	backgroundGradient.setColorAt(0.0, QRgb(0xffffff));
	19	backgroundGradient.setColorAt(1.0, QRgb(0xffffff));
	20	backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
	21	m_chartBackgroundGradient = backgroundGradient;
	22
	23	// Axes and other
	24	m_masterFont = QFont();
	25	m_axisLinePen = QPen(QRgb(0x424242));
	26	m_axisLinePen.setWidth(1);
	27	m_axisLabelBrush = QBrush(QRgb(0x424242));
	28	m_axisLabelPen = Qt::NoPen; // NoPen for performance reasons
	29	m_backgroundShadesPen = Qt::NoPen;
	30	m_backgroundShades = BackgroundShadesNone;
	31	m_gridLinePen = QPen(QRgb(0x424242));
	32	m_gridLinePen.setWidth(1);
	33	}
	34	};
	35
	36	QTCOMMERCIALCHART_END_NAMESPACE

src/charttheme.cpp +9 -5

             #include "charttheme_p.h"
             #include "qchart.h"
+            #include "qchartview.h"
             #include "qlegend.h"
             #include "qchartaxis.h"
             #include <QTime>
             #include "chartthemegrayscale_p.h"
             #include "chartthemescientific_p.h"
             #include "chartthemebluecerulean_p.h"
+            #include "chartthemelight_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                         return new ChartThemeScientific();
                     case QChart::ChartThemeBlueCerulean:
                         return new ChartThemeBlueCerulean();
+                    case QChart::ChartThemeLight:
+                        return new ChartThemeLight();
                     default:
                         return new ChartThemeDefault();
                 }
             void ChartTheme::decorate(QChart* chart)
             {
-                if (m_backgroundShades == BackgroundShadesNone)
+                if (m_backgroundShades == BackgroundShadesNone) {
-                    chart->setChartBackgroundBrush(m_backgroundGradient);
+                    chart->setChartBackgroundBrush(m_chartBackgroundGradient);
-                else
+                } else {
                     chart->setChartBackgroundBrush(Qt::NoBrush);
+                }
                 chart->setChartTitleFont(m_masterFont);
             }
             void ChartTheme::decorate(QLegend* legend)
             {
-                legend->setBackgroundBrush(m_backgroundGradient);
+                legend->setBackgroundBrush(m_chartBackgroundGradient);
             }
             void ChartTheme::decorate(QAreaSeries* series, int index)
                 if (axis->isAxisVisible()) {
                     axis->setLabelsBrush(m_axisLabelBrush);
                     axis->setLabelsPen(m_axisLabelPen);
-                    // TODO: check the axis type (x or y) should define whether to show the shades or not
                     if (m_backgroundShades == BackgroundShadesBoth
                             || (m_backgroundShades == BackgroundShadesVertical && axisX)
                             || (m_backgroundShades == BackgroundShadesHorizontal && !axisX)) {

src/charttheme_p.h +1 -1

                 QChart::ChartTheme m_id;
                 QList<QColor> m_seriesColors;
                 QList<QGradient> m_seriesGradients;
-                QLinearGradient m_backgroundGradient;
+                QLinearGradient m_chartBackgroundGradient;
                 QFont m_masterFont;
                 QPen m_axisLinePen;

src/qchart.cpp +1 0

                 \value ChartThemeGrayscale
                 \value ChartThemeScientific
                 \value ChartThemeBlueCerulean
+                \value ChartThemeLight
                 \value ChartThemeCount Not really a theme; the total count of themes.
             */

src/qchart.h +1 0

                     ChartThemeGrayscale,
                     ChartThemeScientific,
                     ChartThemeBlueCerulean,
+                    ChartThemeLight,
                     ChartThemeCount
                 };

src/qchartview.cpp +17 -6

                 Constructs a chartView object which is a child of a\a parent.
             */
             QChartView::QChartView(QWidget *parent) :
-            QGraphicsView(parent),
+                QGraphicsView(parent),
-            m_scene(new QGraphicsScene(this)),
+                m_scene(new QGraphicsScene(this)),
-            m_chart(new QChart()),
+                m_chart(new QChart()),
-            m_rubberBand(0),
+                m_rubberBand(0),
-            m_verticalRubberBand(false),
+                m_verticalRubberBand(false),
-            m_horizonalRubberBand(false)
+                m_horizonalRubberBand(false)
             {
                 setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
                 setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
             */
             void QChartView::setChartTheme(QChart::ChartTheme theme)
             {
+                if (theme == QChart::ChartThemeBlueCerulean) {
+                    QLinearGradient backgroundGradient;
+                    backgroundGradient.setColorAt(0.0, QRgb(0x056188));
+                    backgroundGradient.setColorAt(1.0, QRgb(0x101a33));
+                    backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
+                    setBackgroundBrush(backgroundGradient);
+                } else {
+                    setBackgroundBrush(Qt::NoBrush);
+                }
                 m_chart->setChartTheme(theme);
             }
             	m_chart->scroll(dx,dy);
             }
+            #include "moc_qchartview.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchartview.h +2 -3

             class QTCOMMERCIALCHART_EXPORT QChartView : public QGraphicsView
             {
+                Q_OBJECT
             public:
                 enum  RubberBandPolicy { NoRubberBand, VerticalRubberBand, HorizonalRubberBand, RectangleRubberBand };
                 void mouseReleaseEvent(QMouseEvent *event);
                 void keyPressEvent(QKeyEvent *event);
             private:
                 QGraphicsScene *m_scene;
                 QChart* m_chart;
                 bool m_verticalRubberBand;
                 bool m_horizonalRubberBand;
                 Q_DISABLE_COPY(QChartView)
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/src.pro +3 -1

                 themes/chartthemegrayscale_p.h \
                 themes/chartthemescientific_p.h \
                 themes/chartthemevanilla_p.h \
-                themes/chartthemebluecerulean_p.h
+                themes/chartthemebluecerulean_p.h \
+                themes/chartthemelight_p.h
             HEADERS += $$PUBLIC_HEADERS
             HEADERS += $$PRIVATE_HEADERS
             HEADERS += $$THEMES

src/themes/chartthemebluecerulean_p.h +6 -10

                     m_seriesColors << QRgb(0x4fbef3);
                     generateSeriesGradients();
-                    // Background
+                    // No chart background, chart view specifies a background
-                    QLinearGradient backgroundGradient;
+                    // TODO: what if the chart is drawn on custom graphics scene instead of QChartView?
-                    backgroundGradient.setColorAt(0.0, QRgb(0x056188));
-                    backgroundGradient.setColorAt(1.0, QRgb(0x101a33));
-                    backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
-                    m_backgroundGradient = backgroundGradient;
                     // Axes and other
                     m_masterFont = QFont();
-                    m_axisLinePen = QPen(QRgb(0x0f0f0f));
+                    m_axisLinePen = QPen(QRgb(0xf7f7ff));
                     m_axisLinePen.setWidth(2);
-                    m_axisLabelBrush = QBrush(QRgb(0x3f3f3f));
+                    m_axisLabelBrush = QBrush(QRgb(0xf7f7ff));
                     m_axisLabelPen = Qt::NoPen; // NoPen for performance reasons
                     m_backgroundShadesPen = Qt::NoPen;
                     m_backgroundShades = BackgroundShadesNone;
-                    m_gridLinePen = QPen(QRgb(0x0f0f0f));
+                    m_gridLinePen = QPen(QRgb(0xf7f7ff));
-                    m_gridLinePen.setWidth(2);
+                    m_gridLinePen.setWidth(1);
                 }
             };

src/themes/chartthemedefault_p.h +1 -1

                     backgroundGradient.setColorAt(0.0, QRgb(0xffffff));
                     backgroundGradient.setColorAt(1.0, QRgb(0xe9e9e9));
                     backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
-                    m_backgroundGradient = backgroundGradient;
+                    m_chartBackgroundGradient = backgroundGradient;
                     // Axes and other
                     m_masterFont = QFont();

src/themes/chartthemegrayscale_p.h +2 -1

                     backgroundGradient.setColorAt(0.0, QRgb(0xffffff));
                     backgroundGradient.setColorAt(1.0, QRgb(0xe0e3e5));
                     backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
-                    m_backgroundGradient = backgroundGradient;
+                    m_chartBackgroundGradient = backgroundGradient;
                     // Axes and other
                     m_masterFont = QFont();
                     m_axisLabelBrush = QBrush(QRgb(0x3f3f3f));
                     m_axisLabelPen = Qt::NoPen; // NoPen for performance reasons
                     m_backgroundShadesPen = Qt::NoPen;
+                    m_backgroundShades = BackgroundShadesNone;
                     m_gridLinePen = QPen(QRgb(0x0f0f0f));
                     m_gridLinePen.setWidth(2);
                 }

src/themes/chartthemeicy_p.h +2 -1

                     backgroundGradient.setColorAt(0.0, QRgb(0xebebeb));
                     backgroundGradient.setColorAt(1.0, QRgb(0xf8f9fb));
                     backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
-                    m_backgroundGradient = backgroundGradient;
+                    m_chartBackgroundGradient = backgroundGradient;
                     // Axes and other
                     m_masterFont = QFont();
                     m_axisLabelBrush = QBrush(QRgb(0x3f3f3f));
                     m_axisLabelPen = Qt::NoPen; // NoPen for performance reasons
                     m_backgroundShadesPen = Qt::NoPen;
+                    m_backgroundShades = BackgroundShadesNone;
                     m_gridLinePen = QPen(QRgb(0x0f0f0f));
                     m_gridLinePen.setWidth(2);
                 }

src/themes/chartthemescientific_p.h +1 -1

                     backgroundGradient.setColorAt(0.0, QRgb(0xfffefc));
                     backgroundGradient.setColorAt(1.0, QRgb(0xfffefc));
                     backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
-                    m_backgroundGradient = backgroundGradient;
+                    m_chartBackgroundGradient = backgroundGradient;
                     // Axes and other
                     m_masterFont = QFont();

src/themes/chartthemevanilla_p.h +2 -1

                     backgroundGradient.setColorAt(0.0, QRgb(0xfbf9f1));
                     backgroundGradient.setColorAt(1.0, QRgb(0xf5f0dc));
                     backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
-                    m_backgroundGradient = backgroundGradient;
+                    m_chartBackgroundGradient = backgroundGradient;
                     // Axes and other
                     m_masterFont = QFont();
                     m_axisLabelBrush = QBrush(QRgb(0xa0a071));
                     m_axisLabelPen = Qt::NoPen; // NoPen for performance reasons
                     m_backgroundShadesPen = Qt::NoPen;
+                    m_backgroundShades = BackgroundShadesNone;
                     m_gridLinePen = QPen(QRgb(0x0f0f0f));
                     m_gridLinePen.setWidth(2);
                 }

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