HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r464:407de0c5cf5b

Refactors linechart update calls

Michal Klocek -

r464:407de0c5cf5b

parent child

Context file:

r464:407de0c5cf5b

Collapse all files

src/areachart/areachartitem_p.h +2 -2

                 ~AreaBoundItem(){};
-                void applyGeometry(QVector<QPointF>& points){
+                void setGeometry(QVector<QPointF>& points){
-                    LineChartItem::applyGeometry(points);
+                    LineChartItem::setGeometry(points);
                     m_item->updatePath();
                 }

src/linechart/linechartanimationitem.cpp +17 -7

             {
             }
-            void LineChartAnimationItem::updateItem(QVector<QPointF>& oldPoints,QVector<QPointF>& newPoints)
+            void LineChartAnimationItem::updateAllPoints()
             {
+                QVector<QPointF> oldPoints = points();
+                LineChartItem::updateAllPoints();
+                QVector<QPointF> newPoints = points();
                 if(newPoints.count()==0) return;
                 oldPoints.resize(newPoints.size());
                 m_animation->setKeyValueAt(1.0, qVariantFromValue(newPoints));
                 QTimer::singleShot(0,m_animation,SLOT(start()));
-                oldPoints = newPoints;
                 m_points = newPoints;
                 m_dirty=false;
             }
-            void LineChartAnimationItem::updateItem(QVector<QPointF>& oldPoints,int index,QPointF& newPoint)
+            void LineChartAnimationItem::updatePoint(int index,QPointF& newPoint)
             {
                 if(m_animation->state()!=QAbstractAnimation::Stopped){
                    m_animation->stop();
                    m_dirty=true;
                 }
                 if(m_dirty){
-                	m_points=oldPoints;
+                	m_points=points();
                 	m_dirty=false;
                 }
-                oldPoints.replace(index,newPoint);
+                LineChartItem::updatePoint(index,newPoint);
                 m_animation->setDuration(duration);
                 m_animation->setEasingCurve(QEasingCurve::InOutBack);
                 m_animation->setKeyValueAt(0.0, qVariantFromValue(m_points));
-                m_animation->setKeyValueAt(1.0, qVariantFromValue(oldPoints));
+                m_animation->setKeyValueAt(1.0, qVariantFromValue( points()));
                 QTimer::singleShot(0,this,SLOT(startAnimation()));
             }
             void LineChartAnimationItem::startAnimation()
             void LineChartAnimatator::updateCurrentValue (const QVariant & value )
             {
             	QVector<QPointF> vector = qVariantValue<QVector<QPointF> >(value);
-                m_item->applyGeometry(vector);
+            	if(state()!=QAbstractAnimation::Stopped){ //workaround
+                m_item->setGeometry(vector);
+            	}
             }
             #include "moc_linechartanimationitem_p.cpp"

src/linechart/linechartanimationitem_p.h +2 -2

             	virtual ~LineChartAnimationItem();
             protected:
-                virtual void updateItem(QVector<QPointF>& oldPoints,QVector<QPointF>& newPoints);
+            	 virtual void updateAllPoints();
-                virtual void updateItem(QVector<QPointF>& oldPoints,int index,QPointF& newPoint);
+            	 virtual void updatePoint(int index,QPointF& newPoint);
             private slots:
             	void startAnimation();

src/linechart/linechartitem.cpp +45 -39

                 return points;
             }
-            void LineChartItem::updateItem(QVector<QPointF>& oldPoints,QVector<QPointF>& newPoints)
+            void LineChartItem::updateAllPoints()
             {
-            	applyGeometry(newPoints);
+                QVector<QPointF> points = calculateGeometryPoints();
-            	oldPoints = newPoints;
+                int diff = m_points.size() - points.size();
+                if(diff>0) {
+                    clearPoints(diff);
+                }
+                else if(diff<0) {
+                    createPoints(-diff);
+                }
+            	setGeometry(points);
             }
-            void LineChartItem::updateItem(QVector<QPointF>& oldPoints,int index,QPointF& newPoint)
+            void LineChartItem::updatePoints(QVector<QPointF>& points)
             {
-            	oldPoints.replace(index,newPoint);
+                int diff = m_points.size() - points.size();
-            	applyGeometry(oldPoints);
+                 if(diff>0) {
+                     clearPoints(diff);
+                 }
+                 else if(diff<0) {
+                     createPoints(-diff);
+                 }
+                 setGeometry(points);
+            }
+            void LineChartItem::updatePoint(int index,QPointF& newPoint)
+            {
+            	m_points.replace(index,newPoint);
+            	setGeometry(m_points);
             }
-            void LineChartItem::applyGeometry(QVector<QPointF>& points)
+            void LineChartItem::setGeometry(QVector<QPointF>& points)
             {
                if(points.size()==0) return;
                prepareGeometryChange();
                m_path = path;
                m_rect = path.boundingRect();
+               m_points = points;
             }
             void LineChartItem::setPen(const QPen& pen)
                 createPoints(1);
                 QVector<QPointF> points = m_points;
                 points.insert(index,point);
-                updateItem(m_points,points);
+                updatePoints(points);
                 update();
             }
             void LineChartItem::handlePointRemoved(int index)
             {
                 Q_ASSERT(index<m_series->count());
                 Q_ASSERT(index>=0);
                 QPointF point = calculateGeometryPoint(index);
                 clearPoints(1);
                 QVector<QPointF> points = m_points;
                 points.remove(index);
-                updateItem(m_points,points);
+                updatePoints(points);
                 update();
             }
                 Q_ASSERT(index<m_series->count());
                 Q_ASSERT(index>=0);
                 QPointF point = calculateGeometryPoint(index);
-                updateItem(m_points,index,point);
+                updatePoint(index,point);
                 update();
             }
                 m_minY=minY;
                 m_maxY=maxY;
-                if( (m_maxX - m_minX) == 0|| (m_maxY - m_minY) == 0) return;
+                if(isEmpty()) return;
-                if(!m_clipRect.isValid()) return;
+                updateAllPoints();
-                QVector<QPointF> points = calculateGeometryPoints();
-                int diff = m_points.size() - points.size();
-                if(diff>0) {
-                      clearPoints(diff);
-                else if(diff<0) {
-                      createPoints(-diff);
-                updateItem(m_points,points);
                 update();
             }
             	m_clipRect=rect.translated(-rect.topLeft());
             	setPos(rect.topLeft());
-            	if( (m_maxX - m_minX) == 0|| (m_maxY - m_minY) == 0) return;
+            	if(isEmpty()) return;
+            	updateAllPoints();
-            	QVector<QPointF> points = calculateGeometryPoints();
-            	int diff = m_points.size() - points.size();
-            	if(diff>0) {
-            		clearPoints(diff);
-            	else if(diff<0) {
-            		createPoints(-diff);
-            	updateItem(m_points,points);
             	update();
             }
                 painter->restore();
             }
+            bool LineChartItem::isEmpty()
+            {
+               return !m_clipRect.isValid() ||  m_maxX - m_minX == 0 || m_maxY - m_minY ==0 ;
+            }
             #include "moc_linechartitem_p.cpp"

src/linechart/linechartitem_p.h +10 -4

                 void handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY);
                 void handleGeometryChanged(const QRectF& size);
-            public:
+            protected:
-                virtual void updateItem(QVector<QPointF>& oldPoints,QVector<QPointF>& newPoints);
+                virtual void updateAllPoints();
-                virtual void updateItem(QVector<QPointF>& oldPoints,int index,QPointF& newPoint);
+                virtual void updatePoints(QVector<QPointF>& points);
-                virtual void applyGeometry(QVector<QPointF>& points);
+                virtual void updatePoint(int index,QPointF& newPoint);
+                virtual void setGeometry(QVector<QPointF>& points);
+                QVector<QPointF> points() {return m_points;}
                 void createPoints(int count);
                 void clearPoints(int count);
                 QPointF calculateGeometryPoint(int index) const;
                 QVector<QPointF> calculateGeometryPoints() const;
+                inline bool isEmpty();
             protected:
                 qreal m_minX;
                 QVector<QPointF> m_points;
                 QPen m_pen;
+                friend class LineChartAnimatator;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/splinechart/splinechartitem.cpp +1 -1

                 return QPointF(x,y);
             }
-            void SplineChartItem::applyGeometry(QVector<QPointF>& points)
+            void SplineChartItem::setGeometry(QVector<QPointF>& points)
             {
                 if(points.size()==0) return;

src/splinechart/splinechartitem_p.h +1 -1

                 void updateGeometry();
-                void applyGeometry(QVector<QPointF>& points);
+                void setGeometry(QVector<QPointF>& points);
                 QPointF calculateGeometryControlPoint(int index) const;

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