HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2321:9b8615dbb840

Fix pie animation chrash

Jani Honkonen -

r2321:9b8615dbb840

parent child

Context file:

r2321:9b8615dbb840

src/animations/pieanimation.cpp +6 -2

             ChartAnimation *PieAnimation::updateValue(PieSliceItem *sliceItem, const PieSliceData &sliceData)
             {
                 PieSliceAnimation *animation = m_animations.value(sliceItem);
-                Q_ASSERT(animation);
+                if (!animation) {
-                animation->stop();
+                    animation = new PieSliceAnimation(sliceItem);
+                    m_animations.insert(sliceItem, animation);
+                } else {
+                    animation->stop();
+                }
                 animation->updateValue(sliceData);
                 animation->setDuration(ChartAnimationDuration);

src/animations/piesliceanimation.cpp +3 -1

             PieSliceAnimation::PieSliceAnimation(PieSliceItem *sliceItem)
                 : ChartAnimation(sliceItem),
-                  m_sliceItem(sliceItem)
+                  m_sliceItem(sliceItem),
+                  m_currentValue(m_sliceItem->m_data)
             {
             }
             PieSliceAnimation::~PieSliceAnimation()

src/piechart/piesliceitem_p.h +2 0

                 QPainterPath m_labelArmPath;
                 QRectF m_labelTextRect;
                 bool m_hovered;
+                friend class PieSliceAnimation;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

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