HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1160:9e86776df29c

Removed controlPoint function from SplineSeries Public API

Marek Rosa -

r1160:9e86776df29c

parent child

Context file:

r1160:9e86776df29c

src/splinechart/qsplineseries.cpp +7 -6

                 return QAbstractSeries::SeriesTypeSpline;
             }
-            QPointF QSplineSeries::controlPoint(int index) const
-                Q_D(const QSplineSeries);
-                return d->m_controlPoints[index];
             /*!
                  Sets the \a modelX to be used as a data source for x coordinate and \a modelY to be used
                  as a data source for y coordinate. The \a orientation parameter specifies whether the data
                 return result;
             }
+            QPointF QSplineSeriesPrivate::controlPoint(int index) const
+            {
+                //    Q_D(const QSplineSeries);
+                //    return d->m_controlPoints[index];
+                return m_controlPoints[index];
+            }
             /*!
               Updates the control points, besed on currently avaiable knots.
               */

src/splinechart/qsplineseries.h +1 -1

                 ~QSplineSeries();
                 QAbstractSeries::SeriesType type() const;
-                QPointF controlPoint(int index) const;
+            //    QPointF controlPoint(int index) const;
                 void setModelMapping(int modelX, int modelY, Qt::Orientation orientation = Qt::Vertical);
                 void setModelMappingRange(int first, int count = -1);

src/splinechart/qsplineseries_p.h +2 0

                 Chart* createGraphics(ChartPresenter* presenter);
                 QSplineSeriesPrivate(QSplineSeries* q);
+                QPointF controlPoint(int index) const;
             public Q_SLOTS:
                 void updateControlPoints();

src/splinechart/splinechartitem.cpp +2 -1

             QPointF SplineChartItem::calculateGeometryControlPoint(int index) const
             {
-                return XYChartItem::calculateGeometryPoint(m_series->controlPoint(index));
+            //    return XYChartItem::calculateGeometryPoint(m_series->controlPoint(index));
+                return XYChartItem::calculateGeometryPoint(m_series->d_func()->controlPoint(index));
             }
             void SplineChartItem::setLayout(QVector<QPointF> &points)

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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