HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2491:d86f47a4910b

Refactor the new QXYSeries::pointAt() -> QXYSeries::at()...

Miikka Heikkinen -

r2491:d86f47a4910b

parent child

Context file:

r2491:d86f47a4910b

Collapse all files

src/linechart/linechartitem.cpp +3 -3

                      qreal minX = domain()->minX();
                      qreal maxX = domain()->maxX();
                      qreal minY = domain()->minY();
-                     QPointF currentSeriesPoint = m_series->pointAt(0);
+                     QPointF currentSeriesPoint = m_series->at(0);
                      QPointF currentGeometryPoint = points.at(0);
                      QPointF previousGeometryPoint = points.at(0);
                      int size = m_linePen.width();
                          // degrees and both of the points are within the margin, one in the top half and one in the
                          // bottom half of the chart, the bottom one gets clipped incorrectly.
                          // However, this should be rare occurrence in any sensible chart.
-                         currentSeriesPoint = m_series->pointAt(qMin(seriesLastIndex, i));
+                         currentSeriesPoint = m_series->at(qMin(seriesLastIndex, i));
                          currentGeometryPoint = points.at(i);
                          pointOffGrid = (currentSeriesPoint.x() < minX || currentSeriesPoint.x() > maxX);
                              bool dummyOk; // We know points are ok, but this is needed
                              qreal currentAngle = static_cast<PolarDomain *>(domain())->toAngularCoordinate(currentSeriesPoint.x(), dummyOk);
-                             qreal previousAngle = static_cast<PolarDomain *>(domain())->toAngularCoordinate(m_series->pointAt(i - 1).x(), dummyOk);
+                             qreal previousAngle = static_cast<PolarDomain *>(domain())->toAngularCoordinate(m_series->at(i - 1).x(), dummyOk);
                              if ((qAbs(currentAngle - previousAngle) > 180.0)) {
                                  // If the angle between two points is over 180 degrees (half X range),

src/scatterchart/scatterchartitem.cpp +1 -1

                      // Note that marker map values can be technically incorrect during the animation,
                      // if it was caused by an insert, but this shouldn't be a problem as the points are
                      // fake anyway.
-                     m_markerMap[item] = m_series->pointAt(qMin(seriesLastIndex, i));
+                     m_markerMap[item] = m_series->at(qMin(seriesLastIndex, i));
                      item->setPos(point.x() - rect.width() / 2, point.y() - rect.height() / 2);
                      if (!m_visible || offGridStatus.at(i))

src/splinechart/splinechartitem.cpp +3 -3

                      qreal minX = domain()->minX();
                      qreal maxX = domain()->maxX();
                      qreal minY = domain()->minY();
-                     QPointF currentSeriesPoint = m_series->pointAt(0);
+                     QPointF currentSeriesPoint = m_series->at(0);
                      QPointF currentGeometryPoint = points.at(0);
                      QPointF previousGeometryPoint = points.at(0);
                      bool pointOffGrid = false;
                          // degrees and both of the points are within the margin, one in the top half and one in the
                          // bottom half of the chart, the bottom one gets clipped incorrectly.
                          // However, this should be rare occurrence in any sensible chart.
-                         currentSeriesPoint = m_series->pointAt(qMin(seriesLastIndex, i));
+                         currentSeriesPoint = m_series->at(qMin(seriesLastIndex, i));
                          currentGeometryPoint = points.at(i);
                          pointOffGrid = (currentSeriesPoint.x() < minX || currentSeriesPoint.x() > maxX);
                          if (!pointOffGrid || !previousPointWasOffGrid) {
                              bool dummyOk; // We know points are ok, but this is needed
                              qreal currentAngle = static_cast<PolarDomain *>(domain())->toAngularCoordinate(currentSeriesPoint.x(), dummyOk);
-                             qreal previousAngle = static_cast<PolarDomain *>(domain())->toAngularCoordinate(m_series->pointAt(i - 1).x(), dummyOk);
+                             qreal previousAngle = static_cast<PolarDomain *>(domain())->toAngularCoordinate(m_series->at(i - 1).x(), dummyOk);
                              if ((qAbs(currentAngle - previousAngle) > 180.0)) {
                                  // If the angle between two points is over 180 degrees (half X range),

src/xychart/qxyseries.cpp +1 -1

              /*!
                  Returns point at \a index in internal points vector.
              */
-             const QPointF &QXYSeries::pointAt(int index) const
+             const QPointF &QXYSeries::at(int index) const
              {
                  Q_D(const QXYSeries);
                  return d->m_points.at(index);

src/xychart/qxyseries.h +1 -1

                  int count() const;
                  QList<QPointF> points() const;
-                 const QPointF &pointAt(int index) const;
+                 const QPointF &at(int index) const;
                  QXYSeries &operator << (const QPointF &point);
                  QXYSeries &operator << (const QList<QPointF> &points);

src/xychart/xychart.cpp +1 -1

                  const int seriesLastIndex = m_series->count() - 1;
                  for (int i = 0; i < m_points.size(); i++) {
-                     const QPointF &seriesPoint = m_series->pointAt(qMin(seriesLastIndex, i));
+                     const QPointF &seriesPoint = m_series->at(qMin(seriesLastIndex, i));
                      if (seriesPoint.x() < minX
                          || seriesPoint.x() > maxX
                          || seriesPoint.y() < minY

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