HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1782:3a2daa7222eb

Minor: extra colons, commented out code

Tero Ahola -

r1782:3a2daa7222eb

parent child

Context file:

r1782:3a2daa7222eb

Collapse all files

src/animations/splineanimation.cpp +8 -8

             void SplineAnimation::setup(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, QVector<QPointF> &oldControlPoints, QVector<QPointF> &newControlPoints, int index)
             {
-                if(newPoints.count() * 2 - 2 != newControlPoints.count() || newControlPoints.count() < 2){
+                if (newPoints.count() * 2 - 2 != newControlPoints.count() || newControlPoints.count() < 2) {
-                       m_valid=false;
+                    m_valid=false;
-                       m_dirty=false;
+                    m_dirty=false;
-                       m_item->setGeometryPoints(newPoints);
+                    m_item->setGeometryPoints(newPoints);
-                       m_item->setControlGeometryPoints(newControlPoints);
+                    m_item->setControlGeometryPoints(newControlPoints);
-                       m_item->setDirty(false);
+                    m_item->setDirty(false);
-                       m_item->updateGeometry();
+                    m_item->updateGeometry();
-                       return;
+                    return;
                 }
                 m_type = NewAnimation;

src/splinechart/qsplineseries.cpp 0 -2

             QPointF QSplineSeriesPrivate::controlPoint(int index) const
             {
-                //    Q_D(const QSplineSeries);
-                //    return d->m_controlPoints[index];
                 return m_controlPoints[index];
             }

src/splinechart/splinechartitem.cpp +6 -7

                     controlPoints[2 * i + 1] = calculateGeometryControlPoint(2 * i + 1);
                 }
-                if (m_animation) {
+                if (m_animation)
-                    m_animation->setup(oldPoints,newPoints,m_controlPoints,controlPoints,index);
+                    m_animation->setup(oldPoints, newPoints, m_controlPoints, controlPoints, index);
-                setGeometryPoints(newPoints);
+                m_points = newPoints;
-                setControlGeometryPoints(controlPoints);
+                m_controlPoints = controlPoints;
                 setDirty(false);
                 if (m_animation) {
             void SplineChartItem::updateGeometry()
             {
-                const QVector<QPointF> &points = geometryPoints();
+                const QVector<QPointF> &points = m_points;
-                const QVector<QPointF> &controlPoints = controlGeometryPoints();
+                const QVector<QPointF> &controlPoints = m_controlPoints;
                 if ((points.size()<2) || (controlPoints.size()<2)) {
                 	prepareGeometryChange();

src/xychart/qxyseries.cpp 0 -1

                 int index = d->m_points.indexOf(oldPoint);
                 if(index==-1) return;
                 d->m_points[index] = newPoint;
-            //    emit d->pointReplaced(index);
                 emit pointReplaced(index);
             }

src/xychart/xychart.cpp +6 -9

             m_animation(0),
             m_dirty(true)
             {
-            //    QObject::connect(series->d_func(),SIGNAL(pointReplaced(int)),this,SLOT(handlePointReplaced(int)));
+                QObject::connect(series, SIGNAL(pointReplaced(int)), this, SLOT(handlePointReplaced(int)));
-            //    QObject::connect(series->d_func(),SIGNAL(pointAdded(int)),this,SLOT(handlePointAdded(int)));
+                QObject::connect(series, SIGNAL(pointAdded(int)), this, SLOT(handlePointAdded(int)));
-            //    QObject::connect(series->d_func(),SIGNAL(pointRemoved(int)),this,SLOT(handlePointRemoved(int)));
+                QObject::connect(series, SIGNAL(pointRemoved(int)), this, SLOT(handlePointRemoved(int)));
-                QObject::connect(series, SIGNAL(pointReplaced(int)), this,SLOT(handlePointReplaced(int)));
+                QObject::connect(this, SIGNAL(clicked(QPointF)), series, SIGNAL(clicked(QPointF)));
-                QObject::connect(series, SIGNAL(pointAdded(int)), this,SLOT(handlePointAdded(int)));
-                QObject::connect(series, SIGNAL(pointRemoved(int)), this,SLOT(handlePointRemoved(int)));
-                QObject::connect(this, SIGNAL(clicked(QPointF)), series,SIGNAL(clicked(QPointF)));
             }
             void XYChart::setGeometryPoints(const QVector<QPointF>& points)
                 if (m_animation) {
                     m_animation->setup(oldPoints, newPoints, index);
-                    setGeometryPoints(newPoints);
+                    m_points = newPoints;
                     setDirty(false);
                     presenter()->startAnimation(m_animation);
                 }
                 else {
-                    setGeometryPoints(newPoints);
+                    m_points = newPoints;
                     updateGeometry();
                 }
             }

src/xychart/xychart_p.h +2 -2

                  Q_OBJECT
             public:
                  explicit XYChart(QXYSeries *series, ChartPresenter *presenter);
-                ~XYChart(){};
+                ~XYChart() {}
                 void setGeometryPoints(const QVector<QPointF>& points);
                 QVector<QPointF> geometryPoints() const { return m_points; }
             private:
                 inline bool isEmpty();
-            private:
+            protected:
                 qreal m_minX;
                 qreal m_maxX;
                 qreal m_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