HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1059:c23240068c61

Fix xy series model issues due to API changes

Michal Klocek -

r1059:c23240068c61

parent child

Context file:

r1059:c23240068c61

Collapse all files

src/areachart/qareaseries.cpp +1 -1

                  }
                  if(lowerSeries) {
-                     const QList<QPointF>& points = upperSeries->points();
+                     const QList<QPointF>& points = lowerSeries->points();
                      for (int i = 0; i < points.count(); i++)
                      {

src/splinechart/qsplineseries.cpp +22 -18

              {
                  Q_D(QSplineSeries);
                  QXYSeries::setModelMapping(modelX, modelY, orientation);
-                 d->calculateControlPoints();
+                 d->updateControlPoints();
              }
              ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
                */
              void QSplineSeriesPrivate::calculateControlPoints()
              {
+                 Q_Q(QSplineSeries);
+                 const QList<QPointF>& points = q->points();
-                 int n = m_points.count() - 1;
+                 int n = points.count() - 1;
                  if (n == 1)
                  {
                      //for n==1
-                     m_controlPoints[0].setX((2 * m_points[0].x() + m_points[1].x()) / 3);
-                     m_controlPoints[0].setY((2 * m_points[0].y() + m_points[1].y()) / 3);
-                     m_controlPoints[1].setX(2 * m_controlPoints[0].x() - m_points[0].x());
-                     m_controlPoints[1].setY(2 * m_controlPoints[0].y() - m_points[0].y());
+                     m_controlPoints[0].setX((2 * points[0].x() + points[1].x()) / 3);
+                     m_controlPoints[0].setY((2 * points[0].y() + points[1].y()) / 3);
+                     m_controlPoints[1].setX(2 * m_controlPoints[0].x() - points[0].x());
+                     m_controlPoints[1].setY(2 * m_controlPoints[0].y() - points[0].y());
                      return;
                  }
                  QVector<qreal> vector;
                  vector.resize(n);
-                 vector[0] = m_points[0].x() + 2 * m_points[1].x();
+                 vector[0] = points[0].x() + 2 * points[1].x();
                  for (int i = 1; i < n - 1; ++i){
-                     vector[i] = 4 * m_points[i].x() + 2 * m_points[i + 1].x();
+                     vector[i] = 4 * points[i].x() + 2 * points[i + 1].x();
                  }
-                 vector[n - 1] = (8 * m_points[n-1].x() + m_points[n].x()) / 2.0;
+                 vector[n - 1] = (8 * points[n-1].x() + points[n].x()) / 2.0;
                  QVector<qreal> xControl = firstControlPoints(vector);
-                 vector[0] = m_points[0].y() + 2 * m_points[1].y();
+                 vector[0] = points[0].y() + 2 * points[1].y();
                  for (int i = 1; i < n - 1; ++i) {
-                     vector[i] = 4 * m_points[i].y() + 2 * m_points[i + 1].y();
+                     vector[i] = 4 * points[i].y() + 2 * points[i + 1].y();
                  }
-                 vector[n - 1] = (8 * m_points[n-1].y() + m_points[n].y()) / 2.0;
+                 vector[n - 1] = (8 * points[n-1].y() + points[n].y()) / 2.0;
                  QVector<qreal> yControl = firstControlPoints(vector);
                      j++;
                      if (i < n - 1){
-                         m_controlPoints[j].setX(2 * m_points[i+1].x() - xControl[i + 1]);
-                         m_controlPoints[j].setY(2 * m_points[i+1].y() - yControl[i + 1]);
+                         m_controlPoints[j].setX(2 * points[i+1].x() - xControl[i + 1]);
+                         m_controlPoints[j].setY(2 * points[i+1].y() - yControl[i + 1]);
                      }else{
-                         m_controlPoints[j].setX((m_points[n].x() + xControl[n - 1]) / 2);
-                         m_controlPoints[j].setY((m_points[n].y() + yControl[n - 1]) / 2);
+                         m_controlPoints[j].setX((points[n].x() + xControl[n - 1]) / 2);
+                         m_controlPoints[j].setY((points[n].y() + yControl[n - 1]) / 2);
                      }
                  }
              }
                */
              void QSplineSeriesPrivate::updateControlPoints()
              {
-                 if (m_points.count() > 1) {
-                     m_controlPoints.resize(2*m_points.count()-2);
+                 Q_Q(QSplineSeries);
+                 if (q->count() > 1) {
+                     m_controlPoints.resize(2*q->count()-2);
                      calculateControlPoints();
                  }
              }

src/xychart/qxyseries.cpp +6 -4

                  int tickXCount(domain.tickXCount());
                  int tickYCount(domain.tickYCount());
-                 for (int i = 0; i < m_points.count(); i++)
+                 {
+                 Q_Q(QXYSeries);
-                     qreal x = m_points[i].x();
-                     qreal y = m_points[i].y();
+                 const QList<QPointF>& points = q->points();
+                 for (int i = 0; i < points.count(); i++)
+                 {
+                     qreal x = points[i].x();
+                     qreal y = points[i].y();
                      minX = qMin(minX, x);
                      minY = qMin(minY, y);
                      maxX = qMax(maxX, x);

src/xychart/xychartitem.cpp 0 -1

                  m_maxX=maxX;
                  m_minY=minY;
                  m_maxY=maxY;
                  if (isEmpty()) return;
                  QVector<QPointF> points = calculateGeometryPoints();
                  updateLayout(m_points,points);

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