HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r691:02b456949de5

Fix setting custom color to pie. Now the pie knows if the color is set by the user.

Jani Honkonen -

r691:02b456949de5

parent child

Context file:

r691:02b456949de5

Collapse all files

src/charttheme.cpp +20 -10

              void ChartTheme::decorate(QPieSeries* series, int index, bool force)
              {
-                 QPen pen;
-                 QBrush brush;
                  for (int i(0); i < series->slices().count(); i++) {
-                     if (pen == series->slices().at(i)->slicePen() || force) {
-                         QColor penColor = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 0.0);
-                         series->slices().at(i)->setSlicePen(penColor);
+                     }
+                     QColor penColor = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 0.0);
                      // Get color for a slice from a gradient linearly, beginning from the start of the gradient
                      qreal pos = (qreal) (i + 1) / (qreal) series->count();
-                     if (brush == series->slices().at(i)->sliceBrush() || force) {
-                         QColor brushColor = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), pos);
-                         series->slices().at(i)->setSliceBrush(brushColor);
+                     QColor brushColor = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), pos);
+                     QPieSlice::DataPtr s = series->slices().at(i)->data_ptr();
+                     PieSliceData data = s->m_data;
+                     if (data.m_slicePen.isThemed() || force) {
+                         data.m_slicePen = penColor;
+                         data.m_slicePen.setThemed(true);
+                     }
+                     if (data.m_sliceBrush.isThemed() || force) {
+                         data.m_sliceBrush = brushColor;
+                         data.m_sliceBrush.setThemed(true);
+                     }
+                     if (s->m_data != data) {
+                         s->m_data = data;
+                         emit s->changed();
                      }
                  }
              }

src/piechart/piechartitem.cpp +2 -3

              {
                  bool isEmpty = m_slices.isEmpty();
-                 presenter()->theme()->decorate(m_series, presenter()->dataSet()->seriesIndex(m_series));
+                 presenter()->theme()->decorate(m_series, presenter()->dataSet()->seriesIndex(m_series), false);
                  foreach (QPieSlice *s, slices) {
                      PieSliceItem* item = new PieSliceItem(this);
              void PieChartItem::handleSlicesRemoved(QList<QPieSlice*> slices)
              {
-                 presenter()->theme()->decorate(m_series, presenter()->dataSet()->seriesIndex(m_series));
+                 presenter()->theme()->decorate(m_series, presenter()->dataSet()->seriesIndex(m_series), false);
                  foreach (QPieSlice *s, slices) {
                      if (animator())
                  PieSliceData sliceData = slice->data_ptr()->m_data;
                  sliceData.m_center = PieSliceItem::sliceCenter(m_pieCenter, m_pieRadius, slice);
                  sliceData.m_radius = m_pieRadius;
-                 sliceData.m_angleSpan = slice->endAngle() - slice->startAngle();
                  return sliceData;
              }

src/piechart/pieslicedata_p.h +71 -9

              #include <qchartglobal.h>
              #include <QPen>
              #include <QBrush>
+             #include <QDebug>
              QTCOMMERCIALCHART_BEGIN_NAMESPACE
+             template <class T>
+             class Themed : public T
+             {
+             public:
+                 Themed():m_isThemed(true) {}
+                 inline T &operator=(const T &other) { return T::operator =(other); }
+                 inline bool operator!=(const T &other) { return T::operator !=(other); }
+                 inline bool operator!=(const Themed &other)
+                 {
+                     if (T::operator !=(other))
+                         return true;
+                     if (m_isThemed != other.m_isThemed)
+                         return true;
+                     return false;
+                 }
+                 inline void setThemed(bool state) { m_isThemed = state; }
+                 inline bool isThemed() const { return m_isThemed; }
+             private:
+                 bool m_isThemed;
+             };
              class PieSliceData
              {
              public:
                  PieSliceData()
                  {
                      m_value = 0;
-                     m_percentage = 0;
-                     m_startAngle = 0;
-                     m_angleSpan = 0;
                      m_isExploded = false;
                      m_explodeDistanceFactor = 0.15;
-                     m_labelVisible = false;
+                     m_isLabelVisible = false;
                      m_labelArmLengthFactor = 0.15;
+                     m_percentage = 0;
+                     m_radius = 0;
+                     m_startAngle = 0;
+                     m_angleSpan = 0;
+                 }
+                 bool operator!=(const PieSliceData &other)
+                 {
+                     if (m_value != other.m_value)
+                         return true;
+                     if (m_slicePen != other.m_slicePen ||
+                         m_sliceBrush != other.m_sliceBrush)
+                         return true;
+                     if (m_isExploded != other.m_isExploded ||
+                         m_explodeDistanceFactor != other.m_explodeDistanceFactor)
+                         return true;
+                     if (m_isLabelVisible != other.m_isLabelVisible ||
+                         m_labelText != other.m_labelText ||
+                         m_labelFont != other.m_labelFont ||
+                         m_labelArmLengthFactor != other.m_labelArmLengthFactor ||
+                         m_labelArmPen != other.m_labelArmPen)
+                         return true;
+                     if (m_percentage != other.m_percentage ||
+                         m_center != other.m_center ||
+                         m_radius != other.m_radius ||
+                         m_startAngle != other.m_startAngle ||
+                         m_angleSpan != other.m_angleSpan)
+                         return true;
+                     return false;
                  }
                  qreal m_value;
-                 QPen m_slicePen;
-                 QBrush m_sliceBrush;
+                 Themed<QPen> m_slicePen;
+                 Themed<QBrush> m_sliceBrush;
                  bool m_isExploded;
                  qreal m_explodeDistanceFactor;
-                 bool m_labelVisible;
+                 bool m_isLabelVisible;
                  QString m_labelText;
-                 QFont m_labelFont;
+                 Themed<QFont> m_labelFont;
                  qreal m_labelArmLengthFactor;
-                 QPen m_labelArmPen;
+                 Themed<QPen> m_labelArmPen;
                  qreal m_percentage;
                  QPointF m_center;

src/piechart/piesliceitem.cpp +1 -1

                  painter->drawPath(m_slicePath);
                  painter->restore();
-                 if (m_data.m_labelVisible) {
+                 if (m_data.m_isLabelVisible) {
                      painter->save();
                      painter->setPen(m_data.m_labelArmPen);
                      painter->drawPath(m_labelArmPath);

src/piechart/qpieslice.cpp +9 -5

              bool QPieSlice::isLabelVisible() const
              {
                  Q_D(const QPieSlice);
-                 return d->m_data.m_labelVisible;
+                 return d->m_data.m_isLabelVisible;
              }
              /*!
              }
              /*!
-                 Gets the label arm lenght factor.
+                 Gets the label arm length factor.
                  The factor is relative to pie radius. For example:
 .0 means the length is the same as the radius.
              void QPieSlice::setLabelVisible(bool visible)
              {
                  Q_D(QPieSlice);
-                 if (d->m_data.m_labelVisible != visible) {
-                     d->m_data.m_labelVisible = visible;
+                 if (d->m_data.m_isLabelVisible != visible) {
+                     d->m_data.m_isLabelVisible = visible;
                      emit changed();
                  }
              }
                  Q_D(QPieSlice);
                  if (d->m_data.m_slicePen != pen) {
                      d->m_data.m_slicePen = pen;
+                     d->m_data.m_slicePen.setThemed(false);
                      emit changed();
                  }
              }
                  Q_D(QPieSlice);
                  if (d->m_data.m_sliceBrush != brush) {
                      d->m_data.m_sliceBrush = brush;
+                     d->m_data.m_sliceBrush.setThemed(false);
                      emit changed();
                  }
              }
                  Q_D(QPieSlice);
                  if (d->m_data.m_labelArmPen != pen) {
                      d->m_data.m_labelArmPen = pen;
+                     d->m_data.m_labelArmPen.setThemed(false);
                      emit changed();
                  }
              }
                  Q_D(QPieSlice);
                  if (d->m_data.m_labelFont != font) {
                      d->m_data.m_labelFont = font;
+                     d->m_data.m_labelFont.setThemed(false);
                      emit changed();
                  }
              }
              /*!
-                 Sets the label arm lenght \a factor.
+                 Sets the label arm length \a factor.
                  The factor is relative to pie radius. For example:
 .0 means the length is the same as the radius.

src/piechart/qpiesliceprivate_p.h +1 0

              public:
                  friend class QPieSeriesPrivate;
+                 friend class ChartTheme;
                  QPieSlice * const q_ptr;
                  PieSliceData m_data;
              };

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