HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1418:faa10209176d

Fix to BarSeries animation on BarSets restructured

Marek Rosa -

r1418:faa10209176d

parent child

Context file:

r1418:faa10209176d

src/animations/chartanimator.cpp +7 -4

              void ChartAnimator::updateLayout(BarChartItem *item, const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout)
              {
                  BarAnimation *animation = static_cast<BarAnimation *>(m_animations.value(item));
-                 Q_ASSERT(animation);
-                 animation->stop();
+                 m_animations.remove(item);
+                 if (animation) {
+                     animation->deleteLater();
+                     animation = 0;
+                 }
+                 addAnimation(item);
+                 animation = static_cast<BarAnimation *>(m_animations.value(item));
                  animation->setDuration(ChartAnimationDuration);
-                 animation->setStartValue(qVariantFromValue(oldLayout));
                  animation->setKeyValueAt(0.0, qVariantFromValue(oldLayout));
                  animation->setKeyValueAt(1.0, qVariantFromValue(newLayout));
-                 animation->setEndValue(qVariantFromValue(newLayout));
                  QTimer::singleShot(0, animation, SLOT(start()));
              }

src/barchart/barchartitem.cpp +3 0

              void BarChartItem::setLayout(const QVector<QRectF> &layout)
              {
+                 if (layout.count() != m_bars.count())
+                     return;
                  m_layout = layout;
-                 for (int i=0; i < m_bars.count(); i++) {

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