HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r393:61d1f8f10e51

Clean up axis animation code

Michal Klocek -

r393:61d1f8f10e51

parent child

Context file:

r393:61d1f8f10e51

Collapse all files

src/axisanimationitem.cpp +17 -14

             #include "axisanimationitem_p.h"
-            #include <QPropertyAnimation>
+            #include <QTimer>
             Q_DECLARE_METATYPE(QVector<qreal>)
             const static int duration = 500;
             AxisAnimationItem::AxisAnimationItem(AxisType type,QGraphicsItem* parent) :
-            AxisItem(type,parent)
+            AxisItem(type,parent),
+            m_animation(new AxisAnimator(this,this))
             {
             }
             {
             }
-            void AxisAnimationItem::updateItems(QVector<qreal>& vector1)
+            void AxisAnimationItem::updateItems(QVector<qreal>& oldLayout,QVector<qreal>& newLayout)
             {
-                QVector<qreal> vector0 = vector1;
+                if(newLayout.count()==0) return;
-                calculateLayout(vector1);
+                oldLayout.resize(newLayout.size());
-                if(vector1.count()==0) return;
-                vector0.resize(vector1.size());
+                if(m_animation->state()!=QAbstractAnimation::Stopped){
+                   m_animation->stop();
-                AxisAnimator *animation = new AxisAnimator(this,this);
-                animation->setDuration(duration);
-                animation->setEasingCurve(QEasingCurve::InOutBack);
+                m_animation->setDuration(duration);
-                animation->setKeyValueAt(0.0, qVariantFromValue(vector0));
+                m_animation->setEasingCurve(QEasingCurve::InOutBack);
-                animation->setKeyValueAt(1.0, qVariantFromValue(vector1));
+                m_animation->setKeyValueAt(0.0, qVariantFromValue(oldLayout));
-                animation->start(QAbstractAnimation::DeleteWhenStopped);
+                m_animation->setKeyValueAt(1.0, qVariantFromValue(newLayout));
+                QTimer::singleShot(0,m_animation,SLOT(start()));
+                oldLayout = newLayout;
             }
             void AxisAnimationItem::setLabelsAngle(int angle)

src/axisanimationitem_p.h +4 -3

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class QChartAxis;
+            class AxisAnimator;
             class AxisAnimationItem : public AxisItem
             {
                 void setLabelsAngle(int angle);
             protected:
-                void updateItems(QVector<qreal>& vector);
+                virtual void updateItems(QVector<qreal>& oldLayout,QVector<qreal>& newLayout);
+            private:
+                AxisAnimator *m_animation;
             };
             class AxisAnimator: public QVariantAnimation

src/axisitem.cpp +18 -10

                 Q_UNUSED(widget);
             }
-            void AxisItem::updateItems(QVector<qreal>& vector)
+            void AxisItem::updateItems(QVector<qreal>& oldLayout,QVector<qreal>& newLayout)
             {
-                calculateLayout(vector);
+                if(newLayout.count()==0) return;
-                if(vector.count()==0) return;
+                applyLayout(newLayout);
-                applyLayout(vector);
+                oldLayout=newLayout;
             }
             void AxisItem::handleAxisUpdate(QChartAxis* axis)
                     createItems(-diff);
                 }
                 m_thicksList=labels;
-                m_layoutVector.resize(m_thicksList.size());
+                QVector<qreal>  vector = calculateLayout();
-                updateItems(m_layoutVector);
+                updateItems(m_layoutVector,vector);
                 if(diff!=0) handleAxisUpdate(axis);
             }
             void AxisItem::handleGeometryChanged(const QRectF& rect)
             {
                 m_rect = rect;
-                updateItems(m_layoutVector);
+                if(m_thicksList.size()==0) return;
+                QVector<qreal>  vector = calculateLayout();
+                updateItems(m_layoutVector,vector);
             }
             void AxisItem::setAxisOpacity(qreal opacity)
                 }
             }
-            void AxisItem::calculateLayout(QVector<qreal>& points)
+            QVector<qreal> AxisItem::calculateLayout() const
             {
+                QVector<qreal> points;
+                points.resize(m_thicksList.size());
                 switch (m_type)
                 {
                     case X_AXIS:
                         const qreal deltaX = m_rect.width()/(m_thicksList.size()-1);
                         for (int i = 0; i < m_thicksList.size(); ++i) {
                              int x = i * deltaX + m_rect.left();
-                             points[i]=x;
+                             points[i] = x;
                         }
                     }
                     break;
                         const qreal deltaY = m_rect.height()/(m_thicksList.size()-1);
                         for (int i = 0; i < m_thicksList.size(); ++i) {
                              int y = i * -deltaY + m_rect.bottom();
-                             points[i]=y;
+                             points[i] = y;
                         }
                     }
                     break;
                 }
+                return points;
             }
             void AxisItem::applyLayout(const QVector<qreal>& points)

src/axisitem_p.h +4 -3

                 void handleLabelsChanged(QChartAxis* axis,const QStringList& labels); //labels from dataset
                 void handleGeometryChanged(const QRectF& size); // geometry from presenter
             public:
-                virtual void updateItems(QVector<qreal>& points);
+                virtual void updateItems(QVector<qreal>& oldLayout,QVector<qreal>& newLayout);
-                virtual void calculateLayout(QVector<qreal>& points);
+                QVector<qreal> calculateLayout() const;
-                virtual void applyLayout(const QVector<qreal>& points);
+                void applyLayout(const QVector<qreal>& points);
             private:
                 void clear(int count);
                 void createItems(int count);

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