HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r939:8c748f062756

Rename pie series total() -> sum() to be consistent with bar series.

Jani Honkonen -

r939:8c748f062756

parent child

Context file:

r939:8c748f062756

Collapse all files

examples/piechartdrilldown/main.cpp +1 -1

                      QObject::connect(series, SIGNAL(clicked(QPieSlice*, Qt::MouseButtons)), chart, SLOT(handleSliceClicked(QPieSlice*)));
-                     *yearSeries << new DrilldownSlice(series->total(), name, series);
+                     *yearSeries << new DrilldownSlice(series->sum(), name, series);
                  }
                  QObject::connect(yearSeries, SIGNAL(clicked(QPieSlice*, Qt::MouseButtons)), chart, SLOT(handleSliceClicked(QPieSlice*)));

src/piechart/qpieseries.cpp +8 -8

                  \sa QPieSlice::value(), QPieSlice::setValue()
              */
-             qreal QPieSeries::total() const
+             qreal QPieSeries::sum() const
              {
                  Q_D(const QPieSeries);
-                 return d->m_total;
+                 return d->m_sum;
              }
              /*!
                  m_pieRelativeSize(0.7),
                  m_pieStartAngle(0),
                  m_pieEndAngle(360),
-                 m_total(0),
+                 m_sum(0),
                  m_mapValues(0),
                  m_mapLabels(0),
                  m_mapOrientation(Qt::Horizontal)
              void QPieSeriesPrivate::updateDerivativeData()
              {
-                 m_total = 0;
+                 m_sum = 0;
                  // nothing to do?
                  if (m_slices.count() == 0)
                      return;
-                 // calculate total
+                 // calculate sum of all slices
                  foreach (QPieSlice* s, m_slices)
-                     m_total += s->value();
+                     m_sum += s->value();
                  // nothing to show..
-                 if (qFuzzyIsNull(m_total))
+                 if (qFuzzyIsNull(m_sum))
                      return;
                  // update slice attributes
                  foreach (QPieSlice* s, m_slices) {
                      PieSliceData data = PieSliceData::data(s);
-                     data.m_percentage = s->value() / m_total;
+                     data.m_percentage = s->value() / m_sum;
                      data.m_angleSpan = pieSpan * data.m_percentage;
                      data.m_startAngle = sliceAngle;
                      sliceAngle += data.m_angleSpan;

src/piechart/qpieseries.h +1 -1

                  // calculated data
                  int count() const;
                  bool isEmpty() const;
-                 qreal total() const;
+                 qreal sum() const;
                  // pie customization
                  void setHorizontalPosition(qreal relativePosition);

src/piechart/qpieseries_p.h +1 -1

                  qreal m_pieRelativeSize;
                  qreal m_pieStartAngle;
                  qreal m_pieEndAngle;
-                 qreal m_total;
+                 qreal m_sum;
                  // model map
                  int m_mapValues;

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