HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2519:9ea7d7fe3500

Return empty brush/pen/font via API rather than the weird default one...

Miikka Heikkinen -

r2519:9ea7d7fe3500

parent child

Context file:

r2519:9ea7d7fe3500

Collapse all files

src/areachart/qareaseries.cpp +9 -3

                  }
              }
-             QPen  QAreaSeries::pen() const
+             QPen QAreaSeries::pen() const
              {
                  Q_D(const QAreaSeries);
-                 return d->m_pen;
+                 if (d->m_pen == QChartPrivate::defaultPen())
+                     return QPen();
+                 else
+                     return d->m_pen;
              }
              /*!
              QBrush QAreaSeries::brush() const
              {
                  Q_D(const QAreaSeries);
-                 return d->m_brush;
+                 if (d->m_brush == QChartPrivate::defaultBrush())
+                     return QBrush();
+                 else
+                     return d->m_brush;
              }
              void QAreaSeries::setColor(const QColor &color)

src/axis/qabstractaxis.cpp +45 -15

              */
              QPen QAbstractAxis::linePen() const
              {
-                 return d_ptr->m_axisPen;
+                 if (d_ptr->m_axisPen == QChartPrivate::defaultPen())
+                     return QPen();
+                 else
+                     return d_ptr->m_axisPen;
              }
              //TODO: remove me 2.0
              QColor QAbstractAxis::linePenColor() const
              {
-                 return d_ptr->m_axisPen.color();
+                 return linePen().color();
              }
              /*!
              */
              QPen QAbstractAxis::gridLinePen() const
              {
-                 return d_ptr->m_gridLinePen;
+                 if (d_ptr->m_gridLinePen == QChartPrivate::defaultPen())
+                     return QPen();
+                 else
+                     return d_ptr->m_gridLinePen;
              }
              void QAbstractAxis::setLabelsVisible(bool visible)
              */
              QPen QAbstractAxis::labelsPen() const
              {
-                 return d_ptr->m_labelsPen;
+                 if (d_ptr->m_labelsPen == QChartPrivate::defaultPen())
+                     return QPen();
+                 else
+                     return d_ptr->m_labelsPen;
              }
              /*!
              */
              QBrush  QAbstractAxis::labelsBrush() const
              {
-                 return d_ptr->m_labelsBrush;
+                 if (d_ptr->m_labelsBrush == QChartPrivate::defaultBrush())
+                     return QBrush();
+                 else
+                     return d_ptr->m_labelsBrush;
              }
              /*!
              */
              QFont QAbstractAxis::labelsFont() const
              {
-                 return d_ptr->m_labelsFont;
+                 if (d_ptr->m_labelsFont == QChartPrivate::defaultFont())
+                     return QFont();
+                 else
+                     return d_ptr->m_labelsFont;
              }
              void QAbstractAxis::setLabelsAngle(int angle)
              QColor QAbstractAxis::labelsColor() const
              {
-                 return d_ptr->m_labelsBrush.color();
+                 return labelsBrush().color();
              }
              void QAbstractAxis::setTitleVisible(bool visible)
              */
              QPen QAbstractAxis::titlePen() const
              {
-                 return d_ptr->m_titlePen;
+                 if (d_ptr->m_titlePen == QChartPrivate::defaultPen())
+                     return QPen();
+                 else
+                     return d_ptr->m_titlePen;
              }
              /*!
              /*!
                Returns brush used to draw title.
              */
-             QBrush  QAbstractAxis::titleBrush() const
+             QBrush QAbstractAxis::titleBrush() const
              {
-                 return d_ptr->m_titleBrush;
+                 if (d_ptr->m_titleBrush == QChartPrivate::defaultBrush())
+                     return QBrush();
+                 else
+                     return d_ptr->m_titleBrush;
              }
              /*!
              */
              QFont QAbstractAxis::titleFont() const
              {
-                 return d_ptr->m_titleFont;
+                 if (d_ptr->m_titleFont == QChartPrivate::defaultFont())
+                     return QFont();
+                 else
+                     return d_ptr->m_titleFont;
              }
              void QAbstractAxis::setTitleText(const QString &title)
              */
              QPen QAbstractAxis::shadesPen() const
              {
-                 return d_ptr->m_shadesPen;
+                 if (d_ptr->m_shadesPen == QChartPrivate::defaultPen())
+                     return QPen();
+                 else
+                     return d_ptr->m_shadesPen;
              }
              /*!
              */
              QBrush QAbstractAxis::shadesBrush() const
              {
-                 return d_ptr->m_shadesBrush;
+                 if (d_ptr->m_shadesBrush == QChartPrivate::defaultBrush())
+                     return QBrush(Qt::SolidPattern);
+                 else
+                     return d_ptr->m_shadesBrush;
              }
              void QAbstractAxis::setShadesColor(QColor color)
              QColor QAbstractAxis::shadesColor() const
              {
-                 return d_ptr->m_shadesBrush.color();
+                 return shadesBrush().color();
              }
              void QAbstractAxis::setShadesBorderColor(QColor color)
              QColor QAbstractAxis::shadesBorderColor() const
              {
-                 return d_ptr->m_shadesPen.color();
+                 return shadesPen().color();
              }

src/barchart/qabstractbarseries.cpp +3 -3

                          takeAtPos += step;
                          takeAtPos -= (int) takeAtPos;
                      }
-                     if (forced || QChartPrivate::defaultBrush() == m_barSets.at(i)->brush())
+                     if (forced || QChartPrivate::defaultBrush() == m_barSets.at(i)->d_ptr->m_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 || QChartPrivate::defaultBrush() == m_barSets.at(i)->labelBrush()) {
+                     if (forced || QChartPrivate::defaultBrush() == m_barSets.at(i)->d_ptr->m_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 || QChartPrivate::defaultPen() == m_barSets.at(i)->pen()) {
+                     if (forced || QChartPrivate::defaultPen() == m_barSets.at(i)->d_ptr->m_pen) {
                          QColor c = ChartThemeManager::colorAt(gradients.at(index % gradients.size()), 0.0);
                          m_barSets.at(i)->setPen(c);
                      }

src/barchart/qabstractbarseries.h +1 0

                  friend class HorizontalBarChartItem;
                  friend class HorizontalStackedBarChartItem;
                  friend class HorizontalPercentBarChartItem;
+                 friend class BarSet;
              };
              QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qbarset.cpp +12 -3

              */
              QPen QBarSet::pen() const
              {
-                 return d_ptr->m_pen;
+                 if (d_ptr->m_pen == QChartPrivate::defaultPen())
+                     return QPen();
+                 else
+                     return d_ptr->m_pen;
              }
              /*!
              */
              QBrush QBarSet::brush() const
              {
-                 return d_ptr->m_brush;
+                 if (d_ptr->m_brush == QChartPrivate::defaultBrush())
+                     return QBrush();
+                 else
+                     return d_ptr->m_brush;
              }
              /*!
              */
              QBrush QBarSet::labelBrush() const
              {
-                 return d_ptr->m_labelBrush;
+                 if (d_ptr->m_labelBrush == QChartPrivate::defaultBrush())
+                     return QBrush();
+                 else
+                     return d_ptr->m_labelBrush;
              }
              /*!

src/xychart/qxyseries.cpp +8 -2

              QPen QXYSeries::pen() const
              {
                  Q_D(const QXYSeries);
-                 return d->m_pen;
+                 if (d->m_pen == QChartPrivate::defaultPen())
+                     return QPen();
+                 else
+                     return d->m_pen;
              }
              /*!
              QBrush QXYSeries::brush() const
              {
                  Q_D(const QXYSeries);
-                 return d->m_brush;
+                 if (d->m_brush == QChartPrivate::defaultBrush())
+                     return QBrush();
+                 else
+                     return d->m_brush;
              }
              void QXYSeries::setColor(const QColor &color)

tests/auto/qbarset/tst_qbarset.cpp +3 -3

                  series->append(set2);
                  QVERIFY(set1->brush() == brush);    // Should be customized
-                 QVERIFY(set2->brush() != QBrush()); // Should be decorated by theme
+                 QVERIFY(set2->brush() == QBrush()); // Setting empty brush doesn't reset to theme brush
                  // Remove sets from series
                  series->take(set1);
                  series->append(set1);
                  series->append(set2);
-                 QVERIFY(set1->labelBrush() == brush);       // Should be customized
-                 QVERIFY(set2->labelBrush() != QBrush());    // Should be decorated by theme
+                 QVERIFY(set1->labelBrush() == brush);    // Should be customized
+                 QVERIFY(set2->labelBrush() == QBrush()); // Setting empty brush doesn't reset to theme brush
                  // Test label font
                  // Note: QFont empty constructor creates font with application's default font, so the font may or may not be the

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