HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2516:567bb8091928

Fix explicitly set default pen/brush/font getting overridden by theme...

Miikka Heikkinen -

r2516:567bb8091928

parent child

Context file:

r2516:567bb8091928

Collapse all files

src/areachart/qareaseries.cpp +5 -4

             QAreaSeriesPrivate::QAreaSeriesPrivate(QLineSeries *upperSeries, QLineSeries *lowerSeries, QAreaSeries *q)
                 : QAbstractSeriesPrivate(q),
+                  m_brush(QChartPrivate::defaultBrush()),
+                  m_pen(QChartPrivate::defaultPen()),
                   m_upperSeries(upperSeries),
                   m_lowerSeries(lowerSeries),
                   m_pointsVisible(false)
             void QAreaSeriesPrivate::initializeTheme(int index, ChartTheme* theme, bool forced)
             {
                 Q_Q(QAreaSeries);
-                QPen pen;
-                QBrush brush;
                 const QList<QGradient> gradients = theme->seriesGradients();
                 const QList<QColor> colors = theme->seriesColors();
-                if (forced || pen == m_pen) {
+                if (forced || QChartPrivate::defaultPen() == m_pen) {
+                    QPen pen;
                     pen.setColor(ChartThemeManager::colorAt(gradients.at(index % gradients.size()), 0.0));
                     pen.setWidthF(2);
                     q->setPen(pen);
                 }
-                if (forced || brush == m_brush) {
+                if (forced || QChartPrivate::defaultBrush() == m_brush) {
                     QBrush brush(colors.at(index % colors.size()));
                     q->setBrush(brush);
                 }

src/axis/qabstractaxis.cpp +31 -40

             #include "qabstractaxis_p.h"
             #include "chartdataset_p.h"
             #include "charttheme_p.h"
+            #include "qchart_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                   m_orientation(Qt::Orientation(0)),
                   m_visible(true),
                   m_arrowVisible(true),
+                  m_axisPen(QChartPrivate::defaultPen()),
+                  m_axisBrush(QChartPrivate::defaultBrush()),
                   m_gridLineVisible(true),
+                  m_gridLinePen(QChartPrivate::defaultPen()),
                   m_labelsVisible(true),
+                  m_labelsPen(QChartPrivate::defaultPen()),
+                  m_labelsBrush(QChartPrivate::defaultBrush()),
+                  m_labelsFont(QChartPrivate::defaultFont()),
                   m_labelsAngle(0),
                   m_titleVisible(true),
+                  m_titlePen(QChartPrivate::defaultPen()),
+                  m_titleBrush(QChartPrivate::defaultBrush()),
+                  m_titleFont(QChartPrivate::defaultFont()),
                   m_shadesVisible(false),
-                  m_shadesBrush(Qt::SolidPattern),
+                  m_shadesBrush(QChartPrivate::defaultBrush()),
+                  m_shadesPen(QChartPrivate::defaultPen()),
                   m_shadesOpacity(1.0),
                   m_dirty(false)
             {
             }
             QAbstractAxisPrivate::~QAbstractAxisPrivate()
             void QAbstractAxisPrivate::initializeTheme(ChartTheme* theme, bool forced)
             {
-                QPen pen;
-                QBrush brush;
-                QFont font;
-                bool axisX = m_orientation == Qt::Horizontal;
                 //TODO: introduce axis brush
-                if (m_visible) {
+                if (forced || QChartPrivate::defaultPen() == m_axisPen)
-                    if (m_arrowVisible) {
-                        if (forced || pen == m_axisPen) {
                     q_ptr->setLinePen(theme->axisLinePen());
+                if (forced || QChartPrivate::defaultPen() == m_gridLinePen)
-                    if (m_gridLineVisible) {
-                        if (forced || pen == m_gridLinePen) {
                     q_ptr->setGridLinePen(theme->girdLinePen());
+                if (forced || QChartPrivate::defaultBrush() == m_labelsBrush)
-                    if (m_labelsVisible) {
-                        if (forced || brush == m_labelsBrush){
                     q_ptr->setLabelsBrush(theme->labelBrush());
+                if (forced || QChartPrivate::defaultPen() == m_labelsPen)
-                        if (forced || pen == m_labelsPen){
                     q_ptr->setLabelsPen(Qt::NoPen); // NoPen for performance reasons
+                if (forced || QChartPrivate::defaultFont() == m_labelsFont)
-                        if (forced || font == m_labelsFont){
                     q_ptr->setLabelsFont(theme->labelFont());
+                if (forced || QChartPrivate::defaultBrush() == m_titleBrush)
-                    if (m_titleVisible) {
-                        if (forced || brush == m_titleBrush){
                     q_ptr->setTitleBrush(theme->labelBrush());
+                if (forced || QChartPrivate::defaultPen() == m_titlePen)
-                        if (forced || pen == m_titlePen){
+                    q_ptr->setTitlePen(Qt::NoPen); // NoPen for performance reasons
-                            q_ptr->setTitlePen(Qt::NoPen);// Noen for performance reasons
+                if (forced || QChartPrivate::defaultFont() == m_titleFont) {
-                        if (forced || font == m_titleFont){
                     QFont font(m_labelsFont);
                     font.setBold(true);
                     q_ptr->setTitleFont(font);
                 }
-                    if (forced || m_shadesVisible) {
+                if (forced || QChartPrivate::defaultBrush() == m_shadesBrush)
-                        if (forced || brush == m_shadesBrush){
                     q_ptr->setShadesBrush(theme->backgroundShadesBrush());
+                if (forced || QChartPrivate::defaultPen() == m_shadesPen)
-                        if (forced || pen == m_shadesPen){
                     q_ptr->setShadesPen(theme->backgroundShadesPen());
+                bool axisX = m_orientation == Qt::Horizontal;
                 if (forced && (theme->backgroundShades() == ChartTheme::BackgroundShadesBoth
                         || (theme->backgroundShades() == ChartTheme::BackgroundShadesVertical && axisX)
                         || (theme->backgroundShades() == ChartTheme::BackgroundShadesHorizontal && !axisX))) {
                      q_ptr->setShadesVisible(true);
+                } else if (forced) {
+                    q_ptr->setShadesVisible(false);
                 }
             }

src/axis/qabstractaxis_p.h +1 0

                 QAbstractAxis *q_ptr;
                 QChart *m_chart;
                 QScopedPointer<ChartAxisElement> m_item;
             private:
                 QList<QAbstractSeries*> m_series;

src/barchart/qabstractbarseries.cpp +4 -6

             #include "qbarlegendmarker.h"
             #include "baranimation_p.h"
             #include "abstractbarchartitem_p.h"
+            #include "qchart_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             {
                 const QList<QGradient> gradients = theme->seriesGradients();
-                QBrush brush;
-                QPen pen;
                 qreal takeAtPos = 0.5;
                 qreal step = 0.2;
                 if (m_barSets.count() > 1) {
                         takeAtPos += step;
                         takeAtPos -= (int) takeAtPos;
                     }
-                    if (forced || brush == m_barSets.at(i)->brush())
+                    if (forced || QChartPrivate::defaultBrush() == m_barSets.at(i)->brush())
                         m_barSets.at(i)->setBrush(ChartThemeManager::colorAt(gradients.at(colorIndex), takeAtPos));
                     // Pick label color from the opposite end of the gradient.
                     // 0.3 as a boundary seems to work well.
-                    if (forced || brush == m_barSets.at(i)->labelBrush()) {
+                    if (forced || QChartPrivate::defaultBrush() == m_barSets.at(i)->labelBrush()) {
                         if (takeAtPos < 0.3)
                             m_barSets.at(i)->setLabelBrush(ChartThemeManager::colorAt(gradients.at(index % gradients.size()), 1));
                         else
                             m_barSets.at(i)->setLabelBrush(ChartThemeManager::colorAt(gradients.at(index % gradients.size()), 0));
                     }
-                    if (forced || pen == m_barSets.at(i)->pen()) {
+                    if (forced || QChartPrivate::defaultPen() == m_barSets.at(i)->pen()) {
                         QColor c = ChartThemeManager::colorAt(gradients.at(index % gradients.size()), 0.0);
                         m_barSets.at(i)->setPen(c);
                     }

src/barchart/qbarset.cpp +5 -1

             #include "qbarset.h"
             #include "qbarset_p.h"
             #include "charthelpers_p.h"
+            #include "qchart_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             QBarSetPrivate::QBarSetPrivate(const QString label, QBarSet *parent) : QObject(parent),
                 q_ptr(parent),
-                m_label(label)
+                m_label(label),
+                m_pen(QChartPrivate::defaultPen()),
+                m_brush(QChartPrivate::defaultBrush()),
+                m_labelBrush(QChartPrivate::defaultBrush())
             {
             }

src/chartpresenter.cpp +2 -1

             {
                 if (!m_background) {
                     m_background = new ChartBackground(rootItem());
-                    m_background->setPen(Qt::NoPen);
+                    m_background->setPen(Qt::NoPen); // Theme doesn't touch pen so don't use default
+                    m_background->setBrush(QChartPrivate::defaultBrush());
                     m_background->setZValue(ChartPresenter::BackgroundZValue);
                 }
             }

src/chartthememanager.cpp +11 -30

             void ChartThemeManager::setTheme(QChart::ChartTheme theme)
             {
-                if(m_theme.isNull() || theme != m_theme->id())
+                if (m_theme.isNull() || theme != m_theme->id()) {
                     switch (theme) {
                     case QChart::ChartThemeLight:
                         m_theme.reset(new ChartThemeLight());
                         break;
                     }
-                    if(!m_theme.isNull())
+                    if (!m_theme.isNull()) {
+                        decorateChart(m_chart,m_theme.data());
-                        decorateChart(m_chart,m_theme.data(),true);
+                        decorateLegend(m_chart->legend(),m_theme.data());
-                        decorateLegend(m_chart->legend(),m_theme.data(),true);
+                        foreach (QAbstractAxis* axis, m_axisList)
-                        foreach(QAbstractAxis* axis, m_axisList) {
                             axis->d_ptr->initializeTheme(m_theme.data(), true);
+                        foreach (QAbstractSeries* series, m_seriesMap.keys())
-                        foreach(QAbstractSeries* series, m_seriesMap.keys()) {
                             series->d_ptr->initializeTheme(m_seriesMap[series], m_theme.data(), true);
                     }
                 }
             }
-            void ChartThemeManager::decorateChart(QChart *chart,ChartTheme* theme,bool force) const
+            // decorateChart is only called when theme is forcibly initialized
+            void ChartThemeManager::decorateChart(QChart *chart, ChartTheme *theme) const
             {
-                QBrush brush;
-                if (force || brush == chart->backgroundBrush())
                 chart->setBackgroundBrush(theme->chartBackgroundGradient());
-                if (force) {
-                    // Always clear plotArea brush when forced update, do not touch otherwise
                 QPen pen(Qt::transparent);
+                QBrush brush;
                 chart->setPlotAreaBackgroundBrush(brush);
                 chart->setPlotAreaBackgroundPen(pen);
                 chart->setPlotAreaBackgroundVisible(false);
                 chart->setTitleFont(theme->masterFont());
                 chart->setTitleBrush(theme->labelBrush());
                 chart->setDropShadowEnabled(theme->isBackgroundDropShadowEnabled());
             }
-            void ChartThemeManager::decorateLegend(QLegend *legend, ChartTheme* theme, bool force) const
+            // decorateLegend is only called when theme is forcibly initialized
+            void ChartThemeManager::decorateLegend(QLegend *legend, ChartTheme *theme) const
             {
-                QPen pen;
-                QBrush brush;
-                QFont font;
-                if (force || pen == legend->pen())
                 legend->setPen(theme->axisLinePen());
-                if (force || brush == legend->brush())
                 legend->setBrush(theme->chartBackgroundGradient());
-                if (force || font == legend->font())
                 legend->setFont(theme->labelFont());
-                if (force || brush == legend->labelBrush())
                 legend->setLabelBrush(theme->labelBrush());
             }

src/chartthememanager_p.h +2 -2

                 explicit ChartThemeManager(QChart* chart);
                 void setTheme(QChart::ChartTheme theme);
                 ChartTheme* theme() const { return m_theme.data(); }
-                void decorateChart(QChart *chart, ChartTheme* theme, bool force = false) const;
+                void decorateChart(QChart *chart, ChartTheme* theme) const;
-                void decorateLegend(QLegend *legend, ChartTheme* theme, bool force = false) const;
+                void decorateLegend(QLegend *legend, ChartTheme* theme) const;
                 void updateSeries(QAbstractSeries *series);
             public:

src/linechart/qlineseries.cpp +2 -2

             #include "linechartitem_p.h"
             #include "chartdataset_p.h"
             #include "charttheme_p.h"
+            #include "qchart_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 Q_Q(QLineSeries);
                 const QList<QColor> colors = theme->seriesColors();
+                if (forced || QChartPrivate::defaultPen() == m_pen) {
                     QPen pen;
-                if (forced || pen == m_pen) {
                     pen.setColor(colors.at(index % colors.size()));
                     pen.setWidthF(2);
                     q->setPen(pen);

src/qchart.cpp +30 0

@@ -687,6 +687,36 QChartPrivate::~QChartPrivate()
687	{	687	{
688	}	688	}
689		689
		690	// Hackish solution to the problem of explicitly assigning the default pen/brush/font
		691	// to a series or axis and having theme override it:
		692	// Initialize pens, brushes, and fonts to something nobody is likely to ever use,
		693	// so that default theme initialization will always set these properly.
		694	QPen &QChartPrivate::defaultPen()
		695	{
		696	static QPen *defaultPen = 0;
		697	if (!defaultPen)
		698	defaultPen = new QPen(QColor(1, 2, 0), 0.93247536);
		699	return *defaultPen;
		700	}
		701
		702	QBrush &QChartPrivate::defaultBrush()
		703	{
		704	static QBrush *defaultBrush = 0;
		705	if (!defaultBrush)
		706	defaultBrush = new QBrush(QColor(1, 2, 0), Qt::Dense7Pattern);
		707	return *defaultBrush;
		708	}
		709
		710	QFont &QChartPrivate::defaultFont()
		711	{
		712	static QFont *defaultFont = 0;
		713	if (!defaultFont) {
		714	defaultFont = new QFont();
		715	defaultFont->setPointSizeF(8.34563465);
		716	}
		717	return *defaultFont;
		718	}
		719
690	void QChartPrivate::init()	720	void QChartPrivate::init()
691	{	721	{
692	m_legend = new LegendScroller(q_ptr);	722	m_legend = new LegendScroller(q_ptr);

src/qchart_p.h +4 0

                 ChartThemeManager *m_themeManager;
                 QChart::ChartType m_type;
+                static QPen &defaultPen();
+                static QBrush &defaultBrush();
+                static QFont &defaultFont();
                 void init();
                 void zoomIn(qreal factor);
                 void zoomOut(qreal factor);

src/scatterchart/qscatterseries.cpp +4 -4

             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             #include "scatteranimation_p.h"
+            #include "qchart_p.h"
             /*!
                 \class QScatterSeries
             void QScatterSeriesPrivate::initializeTheme(int index, ChartTheme* theme, bool forced)
             {
                 Q_Q(QScatterSeries);
-                QPen pen;
-                QBrush brush;
                 const QList<QColor> colors = theme->seriesColors();
                 const QList<QGradient> gradients = theme->seriesGradients();
-                if (forced || pen == m_pen) {
+                if (forced || QChartPrivate::defaultPen() == m_pen) {
+                    QPen pen;
                     pen.setColor(ChartThemeManager::colorAt(gradients.at(index % gradients.size()), 0.0));
                     pen.setWidthF(2);
                     q->setPen(pen);
                 }
-                if (forced || brush == m_brush) {
+                if (forced || QChartPrivate::defaultBrush() == m_brush) {
                     QBrush brush(colors.at(index % colors.size()));
                     q->setBrush(brush);
                 }

src/splinechart/qsplineseries.cpp +2 -1

             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             #include "splineanimation_p.h"
+            #include "qchart_p.h"
             /*!
                 \class QSplineSeries
                 Q_Q(QSplineSeries);
                 const QList<QColor> colors = theme->seriesColors();
+                if (forced || QChartPrivate::defaultPen() == m_pen) {
                     QPen pen;
-                if (forced || pen == m_pen) {
                     pen.setColor(colors.at(index % colors.size()));
                     pen.setWidthF(2);
                     q->setPen(pen);

src/themes/charttheme_p.h +3 -1

             protected:
                 explicit ChartTheme(QChart::ChartTheme id = QChart::ChartThemeLight):m_id(id),
                     m_backgroundShades(BackgroundShadesNone),
-                m_backgroundDropShadowEnabled(false){};
+                    m_backgroundShadesBrush(Qt::SolidPattern),
+                    m_backgroundDropShadowEnabled(false)
+                {};
             public:
                 QChart::ChartTheme id() const { return m_id; }
                 QList<QGradient> seriesGradients() const { return m_seriesGradients; }

src/xychart/qxyseries.cpp +3 0

             #include "xychart_p.h"
             #include "qxylegendmarker.h"
             #include "charthelpers_p.h"
+            #include "qchart_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             QXYSeriesPrivate::QXYSeriesPrivate(QXYSeries *q)
                 : QAbstractSeriesPrivate(q),
+                  m_pen(QChartPrivate::defaultPen()),
+                  m_brush(QChartPrivate::defaultBrush()),
                   m_pointsVisible(false)
             {
             }

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