HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1220:8dbddb2db883

prevents flipping in xyseries animation

Michal Klocek -

r1220:8dbddb2db883

parent child

Context file:

r1220:8dbddb2db883

src/animations/chartanimator.cpp +1 -2

             void ChartAnimator::startAnimation(XYAnimation* animation)
             {
                 Q_ASSERT(animation);
-                if (animation->state() != QAbstractAnimation::Stopped)
+                if (animation->state() != QAbstractAnimation::Stopped) animation->stop();
-                animation->stop();
                 animation->setDuration(ChartAnimationDuration);
                 animation->setEasingCurve(QEasingCurve::OutQuart);
                 QTimer::singleShot(0, animation, SLOT(start()));

src/animations/xyanimation.cpp +3 0

             void XYAnimation::setAnimationType(Animation type)
             {
+                if (state() != QAbstractAnimation::Stopped) stop();
                 m_type=type;
             }
             void XYAnimation::setValues(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, int index)
             {
+                if (state() != QAbstractAnimation::Stopped) stop();
                 int x = oldPoints.count();
                 int y = newPoints.count();

src/xychart/xychart.cpp +1 -1

                 QVector<QPointF> points = calculateGeometryPoints();
                 if(m_animation) {
-                    m_animation->setAnimationType(XYAnimation::LineDrawAnimation);
+                    m_animation->setAnimationType(XYAnimation::MoveDownAnimation);
                 }
                 updateChart(m_points,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