HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1053:615ed2b99418

Refactor piechart to avoid using invalid QPieSlice pointers....

Jani Honkonen -

r1053:615ed2b99418

parent child

Context file:

r1053:615ed2b99418

Collapse all files

src/animations/chartanimator.cpp +6 -6

                 QTimer::singleShot(0, animation, SLOT(start()));
             }
-            void ChartAnimator::addAnimation(PieChartItem *item, QPieSlice *slice, const PieSliceData &sliceData, bool isEmpty)
+            void ChartAnimator::addAnimation(PieChartItem *item, PieSliceItem *sliceItem, const PieSliceData &sliceData, bool isEmpty)
             {
                 PieAnimation *animation = static_cast<PieAnimation *>(m_animations.value(item));
                 Q_ASSERT(animation);
-                animation->addSlice(slice, sliceData, isEmpty);
+                animation->addSlice(sliceItem, sliceData, isEmpty);
             }
-            void ChartAnimator::removeAnimation(PieChartItem *item, QPieSlice *slice)
+            void ChartAnimator::removeAnimation(PieChartItem *item, PieSliceItem *sliceItem)
             {
                 PieAnimation *animation = static_cast<PieAnimation *>(m_animations.value(item));
                 Q_ASSERT(animation);
-                animation->removeSlice(slice);
+                animation->removeSlice(sliceItem);
             }
             void ChartAnimator::updateLayout(PieChartItem *item, const PieLayout &layout)
                 animation->updateValues(layout);
             }
-            void ChartAnimator::updateLayout(PieChartItem *item, QPieSlice *slice, const PieSliceData &sliceData)
+            void ChartAnimator::updateLayout(PieChartItem *item, PieSliceItem *sliceItem, const PieSliceData &sliceData)
             {
                 PieAnimation *animation = static_cast<PieAnimation *>(m_animations.value(item));
                 Q_ASSERT(animation);
-                animation->updateValue(slice, sliceData);
+                animation->updateValue(sliceItem, sliceData);
             }
             void ChartAnimator::updateLayout(BarChartItem *item, const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout)

src/animations/chartanimator_p.h +3 -3

                 void updateLayout(SplineChartItem *item, QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, QVector<QPointF> &oldControlPoints, QVector<QPointF> &newContorlPoints, int index);
                 void updateLayout(ChartAxis *item, QVector<qreal> &layout);
-                void addAnimation(PieChartItem *item, QPieSlice *slice, const PieSliceData &sliceData, bool isEmpty);
+                void addAnimation(PieChartItem *item, PieSliceItem *sliceItem, const PieSliceData &sliceData, bool isEmpty);
-                void removeAnimation(PieChartItem *item, QPieSlice *slice);
+                void removeAnimation(PieChartItem *item, PieSliceItem *sliceItem);
                 void updateLayout(PieChartItem *item, const PieLayout &layout);
-                void updateLayout(PieChartItem *item, QPieSlice *slice, const PieSliceData &sliceData);
+                void updateLayout(PieChartItem *item, PieSliceItem *sliceItem, const PieSliceData &sliceData);
                 void updateLayout(BarChartItem *item, const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout);

src/animations/pieanimation.cpp +12 -18

             void PieAnimation::updateValues(const PieLayout &newValues)
             {
-                foreach (QPieSlice *s, newValues.keys())
+                foreach (PieSliceItem *s, newValues.keys())
                     updateValue(s, newValues.value(s));
             }
-            void PieAnimation::updateValue(QPieSlice *slice, const PieSliceData &sliceData)
+            void PieAnimation::updateValue(PieSliceItem *sliceItem, const PieSliceData &sliceData)
             {
-                PieSliceAnimation *animation = m_animations.value(slice);
+                PieSliceAnimation *animation = m_animations.value(sliceItem);
                 Q_ASSERT(animation);
                 animation->stop();
                 QTimer::singleShot(0, animation, SLOT(start()));
             }
-            void PieAnimation::addSlice(QPieSlice *slice, const PieSliceData &sliceData, bool isEmpty)
+            void PieAnimation::addSlice(PieSliceItem *sliceItem, const PieSliceData &sliceData, bool isEmpty)
             {
-                PieSliceAnimation *animation = new PieSliceAnimation(m_item, slice);
+                PieSliceAnimation *animation = new PieSliceAnimation(sliceItem);
-                m_animations.insert(slice, animation);
+                m_animations.insert(sliceItem, animation);
                 PieSliceData startValue = sliceData;
                 startValue.m_radius = 0;
                 QTimer::singleShot(0, animation, SLOT(start()));
             }
-            void PieAnimation::removeSlice(QPieSlice *slice)
+            void PieAnimation::removeSlice(PieSliceItem *sliceItem)
             {
-                PieSliceAnimation *animation = m_animations.value(slice);
+                PieSliceAnimation *animation = m_animations.value(sliceItem);
                 Q_ASSERT(animation);
                 animation->stop();
                 PieSliceData endValue = animation->currentSliceValue();
                 endValue.m_radius = 0;
-                // TODO: find the actual angle where this slice disappears
                 endValue.m_startAngle = endValue.m_startAngle + endValue.m_angleSpan;
                 endValue.m_angleSpan = 0;
                 animation->setDuration(1000);
                 animation->setEasingCurve(QEasingCurve::OutQuart);
-                connect(animation, SIGNAL(finished()), this, SLOT(destroySliceAnimationComplete()));
+                // PieSliceItem is the parent of PieSliceAnimation so the animation will be deleted as well..
+                connect(animation, SIGNAL(finished()), sliceItem, SLOT(deleteLater()));
+                m_animations.remove(sliceItem);
                 QTimer::singleShot(0, animation, SLOT(start()));
             }
                 // nothing to do...
             }
-            void PieAnimation::destroySliceAnimationComplete()
-                PieSliceAnimation *animation = static_cast<PieSliceAnimation *>(sender());
-                QPieSlice *slice = m_animations.key(animation);
-                m_item->destroySlice(slice);
-                delete m_animations.take(slice);
             #include "moc_pieanimation_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/animations/pieanimation_p.h +4 -7

                 PieAnimation(PieChartItem *item);
                 ~PieAnimation();
                 void updateValues(const PieLayout &newValues);
-                void updateValue(QPieSlice *slice, const PieSliceData &newValue);
+                void updateValue(PieSliceItem *sliceItem, const PieSliceData &newValue);
-                void addSlice(QPieSlice *slice, const PieSliceData &endValue, bool isEmpty);
+                void addSlice(PieSliceItem *sliceItem, const PieSliceData &endValue, bool isEmpty);
-                void removeSlice(QPieSlice *slice);
+                void removeSlice(PieSliceItem *sliceItem);
             public: // from QVariantAnimation
                 void updateCurrentValue(const QVariant &value);
-            public Q_SLOTS:
-                void destroySliceAnimationComplete();
             private:
                 PieChartItem *m_item;
-                QHash<QPieSlice *, PieSliceAnimation *> m_animations;
+                QHash<PieSliceItem *, PieSliceAnimation *> m_animations;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/animations/piesliceanimation.cpp +6 -6

             #include "piesliceanimation_p.h"
             #include "piechartitem_p.h"
-            #include "qpieslice.h"
             Q_DECLARE_METATYPE(QTCOMMERCIALCHART_NAMESPACE::PieSliceData)
                 return end;
             }
-            PieSliceAnimation::PieSliceAnimation(PieChartItem *item, QPieSlice *slice)
+            PieSliceAnimation::PieSliceAnimation(PieSliceItem *sliceItem)
-                :QVariantAnimation(item),
+                :QVariantAnimation(sliceItem),
-                m_item(item),
+                m_sliceItem(sliceItem)
-                m_slice(slice)
             {
             }
             {
                 if (state() != QAbstractAnimation::Stopped) { //workaround
                     m_currentValue = qVariantValue<PieSliceData>(value);
-                    m_item->setLayout(m_slice, m_currentValue);
+                    m_sliceItem->setSliceData(m_currentValue);
+                    m_sliceItem->updateGeometry();
+                    m_sliceItem->update();
                 }
             }

src/animations/piesliceanimation_p.h +3 -5

             #ifndef PIESLICEANIMATION_P_H
             #define PIESLICEANIMATION_P_H
-            #include "piechartitem_p.h"
             #include <QVariantAnimation>
+            #include "piesliceitem_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class PieChartItem;
-            class QPieSlice;
             class PieSliceAnimation : public QVariantAnimation
             {
             public:
-                PieSliceAnimation(PieChartItem *item, QPieSlice *slice);
+                PieSliceAnimation(PieSliceItem *sliceItem);
                 ~PieSliceAnimation();
                 void setValue(const PieSliceData &startValue, const PieSliceData &endValue);
                 void updateValue(const PieSliceData &endValue);
                 void updateCurrentValue(const QVariant &value);
             private:
-                PieChartItem *m_item;
+                PieSliceItem *m_sliceItem;
-                QPieSlice *m_slice;
                 PieSliceData m_currentValue;
             };

src/piechart/piechartitem.cpp +22 -26

                     PieSliceData data = sliceData(s);
                     if (animator())
-                        animator()->addAnimation(this, s, data, isEmpty);
+                        animator()->addAnimation(this, item, data, isEmpty);
                     else
-                        setLayout(s, data);
+                        setLayout(item, data);
                 }
             }
             {
                 presenter()->chartTheme()->decorate(m_series, presenter()->dataSet()->seriesIndex(m_series));
-                foreach (QPieSlice *s, slices) {
+                foreach (QPieSlice *slice, slices) {
+                    PieSliceItem *item = m_slices.value(slice);
+                    Q_ASSERT(item);
+                    m_slices.remove(slice);
                     if (animator())
-                        animator()->removeAnimation(this, s);
+                        animator()->removeAnimation(this, item); // animator deletes the PieSliceItem
                     else
-                        destroySlice(s);
+                        delete item;
                 }
             }
                 QPieSlice* slice = qobject_cast<QPieSlice *>(sender());
                 Q_ASSERT(m_slices.contains(slice));
                 PieSliceData data = sliceData(slice);
-                updateLayout(slice, data);
+                updateLayout(m_slices.value(slice), data);
                 update();
             }
                 PieLayout layout;
                 foreach (QPieSlice* s, m_series->slices()) {
                     if (m_slices.contains(s)) // calculate layout only for those slices that are already visible
-                        layout.insert(s, sliceData(s));
+                        layout.insert(m_slices.value(s), sliceData(s));
                 }
                 return layout;
             }
                     setLayout(layout);
             }
-            void PieChartItem::updateLayout(QPieSlice *slice, const PieSliceData &sliceData)
+            void PieChartItem::updateLayout(PieSliceItem *sliceItem, const PieSliceData &sliceData)
             {
                 if (animator())
-                    animator()->updateLayout(this, slice, sliceData);
+                    animator()->updateLayout(this, sliceItem, sliceData);
                 else
-                    setLayout(slice, sliceData);
+                    setLayout(sliceItem, sliceData);
             }
             void PieChartItem::setLayout(const PieLayout &layout)
             {
-                foreach (QPieSlice *slice, layout.keys()) {
+                foreach (PieSliceItem *item, layout.keys()) {
-                    PieSliceItem *item = m_slices.value(slice);
+                    item->setSliceData(layout.value(item));
-                    Q_ASSERT(item);
-                    item->setSliceData(layout.value(slice));
                     item->updateGeometry();
                     item->update();
                 }
             }
-            void PieChartItem::setLayout(QPieSlice *slice, const PieSliceData &sliceData)
+            void PieChartItem::setLayout(PieSliceItem *sliceItem, const PieSliceData &sliceData)
-                // find slice
-                PieSliceItem *item = m_slices.value(slice);
-                Q_ASSERT(item);
-                item->setSliceData(sliceData);
-                item->updateGeometry();
-                item->update();
-            void PieChartItem::destroySlice(QPieSlice *slice)
             {
-                delete m_slices.take(slice);
+                Q_ASSERT(sliceItem);
+                sliceItem->setSliceData(sliceData);
+                sliceItem->updateGeometry();
+                sliceItem->update();
             }
             #include "moc_piechartitem_p.cpp"

src/piechart/piechartitem_p.h +3 -4

             class QPieSlice;
             class ChartPresenter;
-            typedef QHash<QPieSlice*, PieSliceData> PieLayout;
+            typedef QHash<PieSliceItem*, PieSliceData> PieLayout;
             class PieChartItem : public ChartItem
             {
                 PieSliceData sliceData(QPieSlice *slice);
                 PieLayout calculateLayout();
                 void applyLayout(const PieLayout &layout);
-                void updateLayout(QPieSlice *slice, const PieSliceData &sliceData);
+                void updateLayout(PieSliceItem *sliceItem, const PieSliceData &sliceData);
                 void setLayout(const PieLayout &layout);
-                void setLayout(QPieSlice *slice, const PieSliceData &sliceData);
+                void setLayout(PieSliceItem *sliceItem, const PieSliceData &sliceData);
-                void destroySlice(QPieSlice *slice);
             private:
                 friend class PieSliceItem;

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