HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2852:5f71da41b84f

Fix color setting...

Titta Heikkala -

r2852:5f71da41b84f

parent child

Context file:

r2852:5f71da41b84f

Collapse all files

src/charts/axis/qabstractaxis.cpp +5 -5

             void QAbstractAxis::setLinePenColor(QColor color)
             {
-                QPen p = d_ptr->m_axisPen;
+                QPen p = linePen();
                 if (p.color() != color) {
                     p.setColor(color);
                     setLinePen(p);
             void QAbstractAxis::setGridLineColor(const QColor &color)
             {
-                QPen pen = d_ptr->m_gridLinePen;
+                QPen pen = gridLinePen();
                 if (color != pen.color()) {
                     pen.setColor(color);
                     d_ptr->m_gridLinePen = pen;
             void QAbstractAxis::setMinorGridLineColor(const QColor &color)
             {
-                QPen pen = d_ptr->m_minorGridLinePen;
+                QPen pen = minorGridLinePen();
                 if (color != pen.color()) {
                     pen.setColor(color);
                     d_ptr->m_minorGridLinePen = pen;
             }
             void QAbstractAxis::setLabelsColor(QColor color)
             {
-                QBrush b = d_ptr->m_labelsBrush;
+                QBrush b = labelsBrush();
                 if (b.color() != color) {
                     b.setColor(color);
                     setLabelsBrush(b);
             void QAbstractAxis::setShadesColor(QColor color)
             {
-                QBrush b = d_ptr->m_shadesBrush;
+                QBrush b = shadesBrush();
                 if (b.color() != color) {
                     b.setColor(color);
                     setShadesBrush(b);

src/charts/legend/qlegend.cpp +18 -9

              */
             QBrush QLegend::brush() const
             {
-                return d_ptr->m_brush;
+                if (d_ptr->m_brush == QChartPrivate::defaultBrush())
+                    return QBrush();
+                else
+                    return d_ptr->m_brush;
             }
             void QLegend::setColor(QColor color)
             {
-                QBrush b = d_ptr->m_brush;
+                QBrush b = brush();
                 if (b.style() != Qt::SolidPattern || b.color() != color) {
                     b.setStyle(Qt::SolidPattern);
                     b.setColor(color);
             QPen QLegend::pen() const
             {
-                return d_ptr->m_pen;
+                if (d_ptr->m_pen == QChartPrivate::defaultPen())
+                    return QPen();
+                else
+                    return d_ptr->m_pen;
             }
             void QLegend::setFont(const QFont &font)
             void QLegend::setBorderColor(QColor color)
             {
-                QPen p = d_ptr->m_pen;
+                QPen p = pen();
                 if (p.color() != color) {
                     p.setColor(color);
                     setPen(p);
             */
             QBrush QLegend::labelBrush() const
             {
-                return d_ptr->m_labelBrush;
+                if (d_ptr->m_labelBrush == QChartPrivate::defaultBrush())
+                    return QBrush();
+                else
+                    return d_ptr->m_labelBrush;
             }
             void QLegend::setLabelColor(QColor color)
             {
-                QBrush b = d_ptr->m_labelBrush;
+                QBrush b = labelBrush();
                 if (b.style() != Qt::SolidPattern || b.color() != color) {
                     b.setStyle(Qt::SolidPattern);
                     b.setColor(color);
                   m_chart(chart),
                   m_items(new QGraphicsItemGroup(q)),
                   m_alignment(Qt::AlignTop),
-                  m_brush(QBrush()),
+                  m_brush(QChartPrivate::defaultBrush()),
-                  m_pen(QPen()),
+                  m_pen(QChartPrivate::defaultPen()),
-                  m_labelBrush(QBrush()),
+                  m_labelBrush(QChartPrivate::defaultBrush()),
                   m_diameter(5),
                   m_attachedToChart(true),
                   m_backgroundVisible(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