HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1770:6ebf2349194b

Refactor spline animation handling...

Michal Klocek -

r1770:6ebf2349194b

parent child

Context file:

r1770:6ebf2349194b

Collapse all files

src/animations/splineanimation.cpp +24 -49

              QTCOMMERCIALCHART_BEGIN_NAMESPACE
              SplineAnimation::SplineAnimation(SplineChartItem* item):XYAnimation(item),
-             m_item(item)
+             m_item(item),
+             m_valid(false)
              {
              }
              void SplineAnimation::setup(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, QVector<QPointF> &oldControlPoints, QVector<QPointF> &newControlPoints, int index)
              {
-                 Q_ASSERT(newPoints.count() * 2 - 2 == newControlPoints.count());
+                 if(newPoints.count() * 2 - 2 != newControlPoints.count() || newControlPoints.count() < 2){
+                        m_valid=false;
+                        m_dirty=false;
+                        m_item->setGeometryPoints(newPoints);
+                        m_item->setControlGeometryPoints(newControlPoints);
+                        m_item->setDirty(false);
+                        m_item->updateGeometry();
+                        return;
+                 }
                  m_type = NewAnimation;
                  m_newSpline.first=newPoints;
                  m_newSpline.second=newControlPoints;
                  int x = m_oldSpline.first.count();
                  int y = m_newSpline.first.count();
                  setKeyValueAt(0.0, qVariantFromValue(m_oldSpline));
                  setKeyValueAt(1.0, qVariantFromValue(m_newSpline));
-                 /*
-                  int x = oldPoints.count();
-                  int y = newPoints.count();
-                  Q_ASSERT(newPoints.count() * 2 - 2 == newControlPoints.count());
-                  if (x != y && abs(x - y) != 1) {
-                  m_oldSpline.first = newPoints;
-                  m_oldSpline.second = newControlPoints;
-                  oldPoints.resize(newPoints.size());
-                  oldControlPoints.resize(newControlPoints.size());
-                  SplineVector oldPair;
-                  oldPair.first = oldPoints;
-                  oldPair.second = oldControlPoints;
-                  SplineVector newPair;
-                  newPair.first = newPoints;
-                  newPair.second = newControlPoints;
-                  setKeyValueAt(0.0, qVariantFromValue(oldPair));
-                  setKeyValueAt(1.0, qVariantFromValue(newPair));
-                  m_dirty = false;
+                  }
-                  else {
-                  if(m_dirty) {
-                  m_oldSpline.first = oldPoints;
-                  m_oldSpline.second = oldControlPoints;
-                  m_dirty = false;
+                  }
-                  oldPoints = newPoints;
-                  oldControlPoints = newControlPoints;
-                  if (y < x) {
-                  m_oldSpline.first.remove(index); //remove
-                  m_oldSpline.second.remove(index * 2);
-                  m_oldSpline.second.remove(index * 2);
+                  }
-                  if (y > x) {
-                  m_oldSpline.first.insert(index, x > 0 ? m_oldSpline.first[index-1] : newPoints[index]); //add
-                  m_oldSpline.second.insert((index - 1) * 2, x > 1 ? m_oldSpline.second[(index-2)*2] : newControlPoints[(index - 1) * 2]); //add
-                  m_oldSpline.second.insert((index - 1) * 2 + 1, x > 1 ? m_oldSpline.second[(index - 2) * 2 + 1] : newControlPoints[(index - 1) * 2 + 1]); //add
+                  }
-                  SplineVector newPair;
-                  newPair.first=newPoints;
-                  newPair.second=newControlPoints;
-                  setKeyValueAt(0.0, qVariantFromValue(m_oldSpline));
-                  setKeyValueAt(1.0, qVariantFromValue(newPair));
+                  }
-                  */
+                 m_valid=true;
              }
              void SplineAnimation::updateCurrentValue (const QVariant &value )
              {
-                 if (state() != QAbstractAnimation::Stopped) { //workaround
+                 if (state() != QAbstractAnimation::Stopped && m_valid) { //workaround
                      QPair<QVector<QPointF >, QVector<QPointF > > pair = qVariantValue< QPair< QVector<QPointF>, QVector<QPointF> > >(value);
                      m_item->setGeometryPoints(pair.first);
                      m_item->setControlGeometryPoints(pair.second);
              void SplineAnimation::updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState)
              {
+                 XYAnimation::updateState(newState, oldState);
                  if(oldState == QAbstractAnimation::Running && newState == QAbstractAnimation::Stopped)
                  {
                      if(m_item->isDirty() && m_type==RemovePointAnimation) {
                          m_item->setControlGeometryPoints(m_newSpline.second);
                      }
                  }
+                 if(oldState == QAbstractAnimation::Stopped && newState == QAbstractAnimation::Running)
+                 {
+                     if(!m_valid) {
+                        stop();
+                     }
+                 }
              }
              QTCOMMERCIALCHART_END_NAMESPACE

src/animations/splineanimation_p.h +1 0

                  SplineVector m_oldSpline;
                  SplineVector m_newSpline;
                  SplineChartItem *m_item;
+                 bool m_valid;
              };
              QTCOMMERCIALCHART_END_NAMESPACE

src/splinechart/splinechartitem.cpp +7 -12

                      controlPoints[2 * i + 1] = calculateGeometryControlPoint(2 * i + 1);
                  }
-                 if (controlPoints.count()<2) {
-                     setGeometryPoints(newPoints);
-                     setControlGeometryPoints(controlPoints);
-                     updateGeometry();
-                     return;
+                 if (m_animation) {
+                     m_animation->setup(oldPoints,newPoints,m_controlPoints,controlPoints,index);
                  }
+                 setGeometryPoints(newPoints);
+                 setControlGeometryPoints(controlPoints);
+                 setDirty(false);
                  if (m_animation) {
-                     m_animation->setup(oldPoints,newPoints,m_controlPoints,controlPoints,index);
-                     setGeometryPoints(newPoints);
-                     setDirty(false);
                      presenter()->startAnimation(m_animation);
+                 }
-                 else {
-                     setGeometryPoints(newPoints);
-                     setControlGeometryPoints(controlPoints);
+                 } else {
                      updateGeometry();
                  }
              }

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