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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "chartanimator_p.h"
             #include "axisanimation_p.h"
             #include "xyanimation_p.h"
             #include "splineanimation_p.h"
             #include "xychartitem_p.h"
             #include "pieanimation_p.h"
             #include "baranimation_p.h"
             #include "barchartitem_p.h"
             #include "areachartitem_p.h"
             #include "splinechartitem_p.h"
             #include "scatterchartitem_p.h"
             #include <QTimer>
             Q_DECLARE_METATYPE(QVector<QPointF>)
             Q_DECLARE_METATYPE(QVector<qreal>)
             Q_DECLARE_METATYPE(QVector<QRectF>)
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             const static int duration = 1000;
             ChartAnimator::ChartAnimator(QObject *parent):QObject(parent),
                 m_state(ShowState)
             {
             }
             ChartAnimator::~ChartAnimator()
             {
             }
             void ChartAnimator::addAnimation(ChartAxis *item)
             {
                 ChartAnimation *animation = m_animations.value(item);
                 if (!animation) {
                     animation = new AxisAnimation(item);
                     m_animations.insert(item, animation);
                 }
                 item->setAnimator(this);
             }
             void ChartAnimator::addAnimation(SplineChartItem *item)
             {
                 ChartAnimation *animation = m_animations.value(item);
                 if (!animation) {
                     animation = new SplineAnimation(item);
                     m_animations.insert(item, animation);
                 }
                 item->setAnimator(this);
             }
             void ChartAnimator::addAnimation(ScatterChartItem *item)
             {
                 ChartAnimation *animation = m_animations.value(item);
                 if (!animation) {
                     animation = new XYAnimation(item);
                     m_animations.insert(item, animation);
                 }
                 item->setAnimator(this);
             }
             void ChartAnimator::addAnimation(LineChartItem *item)
             {
                 ChartAnimation *animation = m_animations.value(item);
                 if (!animation) {
                     animation = new XYAnimation(item);
                     m_animations.insert(item, animation);
                 }
                 item->setAnimator(this);
             }
             void ChartAnimator::addAnimation(PieChartItem *item)
             {
                 ChartAnimation *animation = m_animations.value(item);
                 if (!animation) {
                     animation = new PieAnimation(item);
                     m_animations.insert(item, animation);
                 }
                 item->setAnimator(this);
             }
             void ChartAnimator::addAnimation(BarChartItem *item)
             {
                 ChartAnimation *animation = m_animations.value(item);
                 if (!animation) {
                     animation = new BarAnimation(item);
                     m_animations.insert(item, animation);
                 }
                 item->setAnimator(this);
             }
             void ChartAnimator::removeAnimation(Chart *item)
             {
                 item->setAnimator(0);
                 m_animations.remove(item);
             }
             void ChartAnimator::updateLayout(ChartAxis *item , QVector<qreal> &newLayout)
             {
                 AxisAnimation *animation = static_cast<AxisAnimation*>(m_animations.value(item));
                 Q_ASSERT(animation);
                 QVector<qreal> oldLayout = item->layout();
                 if (newLayout.count() == 0)
                     return;
                 switch (m_state) {
                 case ZoomOutState: {
                     QRectF rect = item->geometry();
                     oldLayout.resize(newLayout.count());
                     for(int i = 0, j = oldLayout.count() - 1; i < (oldLayout.count() + 1) / 2; ++i, --j) {
                         oldLayout[i] = item->axisType() == ChartAxis::X_AXIS ? rect.left() : rect.bottom();
                         oldLayout[j] = item->axisType() == ChartAxis::X_AXIS ? rect.right() : rect.top();
                     }
                 }
                     break;
                 case ZoomInState: {
                     int index = qMin(oldLayout.count() * (item->axisType() == ChartAxis::X_AXIS ? m_point.x() : (1 - m_point.y())), newLayout.count() - 1.0);
                     oldLayout.resize(newLayout.count());
                     for(int i = 0; i < oldLayout.count(); i++)
                         oldLayout[i]= oldLayout[index];
                 }
                     break;
                 case ScrollDownState:
                 case ScrollRightState: {
                     oldLayout.resize(newLayout.count());
                     for(int i = 0, j = i + 1; i < oldLayout.count() - 1; ++i, ++j)
                         oldLayout[i]= oldLayout[j];
                 }
                     break;
                 case ScrollUpState:
                 case ScrollLeftState: {
                     oldLayout.resize(newLayout.count());
                     for(int i = oldLayout.count() - 1, j = i - 1; i > 0; --i, --j)
                         oldLayout[i]= oldLayout[j];
                 }
                     break;
                 default: {
                     oldLayout.resize(newLayout.count());
                     QRectF rect = item->geometry();
                     for(int i = 0, j = oldLayout.count() - 1; i < oldLayout.count(); ++i, --j)
                         oldLayout[i] = item->axisType() == ChartAxis::X_AXIS ? rect.left() : rect.top();
                 }
                     break;
                 }
                 if (animation->state() != QAbstractAnimation::Stopped)
                     animation->stop();
                 animation->setDuration(duration);
                 animation->setEasingCurve(QEasingCurve::OutQuart);
                 QVariantAnimation::KeyValues value;
                 animation->setKeyValues(value); //workaround for wrong interpolation call
                 animation->setKeyValueAt(0.0, qVariantFromValue(oldLayout));
                 animation->setKeyValueAt(1.0, qVariantFromValue(newLayout));
                 QTimer::singleShot(0, animation, SLOT(start()));
             }
             void ChartAnimator::updateLayout(SplineChartItem *item, QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, QVector<QPointF> &oldControlPoints, QVector<QPointF> &newControlPoints, int index)
             {
                 SplineAnimation *animation = static_cast<SplineAnimation *>(m_animations.value(item));
                 Q_ASSERT(animation);
                 if (newPoints.count() < 2 || newControlPoints.count() < 2)
                     return;
                 bool empty = oldPoints.count() == 0;
                 if (animation->state() != QAbstractAnimation::Stopped)
                     animation->stop();
                 animation->setDuration(duration);
                 if (!empty)
                     animation->setAnimationType(ChartAnimation::MoveDownAnimation);
                 else
                     animation->setAnimationType(ChartAnimation::LineDrawAnimation);
                 animation->setEasingCurve(QEasingCurve::OutQuart);
                 animation->setValues(oldPoints, newPoints, oldControlPoints, newControlPoints, index);
                 QTimer::singleShot(0, animation, SLOT(start()));
             }
             void ChartAnimator::updateLayout(XYChartItem *item, QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, int index)
             {
                 XYAnimation *animation = static_cast<XYAnimation *>(m_animations.value(item));
                 Q_ASSERT(animation);
                 if (newPoints.count() == 0)
                     return;
                 bool empty = oldPoints.count() == 0;
                 if (animation->state() != QAbstractAnimation::Stopped)
                     animation->stop();
                 animation->setDuration(duration);
                 if (!empty)
                     animation->setAnimationType(ChartAnimation::MoveDownAnimation);
                 else
                     animation->setAnimationType(ChartAnimation::LineDrawAnimation);
                 animation->setEasingCurve(QEasingCurve::OutQuart);
                 animation->setValues(oldPoints, newPoints, index);
                 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)
             {
                 PieAnimation *animation = static_cast<PieAnimation *>(m_animations.value(item));
                 Q_ASSERT(animation);
                 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)
             {
                 BarAnimation *animation = static_cast<BarAnimation *>(m_animations.value(item));
                 Q_ASSERT(animation);
                 animation->setDuration(duration);
                 animation->setKeyValueAt(0.0, qVariantFromValue(oldLayout));
                 animation->setKeyValueAt(1.0, qVariantFromValue(newLayout));
                 QTimer::singleShot(0, animation, SLOT(start()));
             }
             void ChartAnimator::setState(State state, const QPointF &point)
             {
                 m_state = state;
                 m_point = point;
             }
             #include "moc_chartanimator_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/animations/chartanimator_p.h +3 -3

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef CHARTANIMATOR_P_H
             #define CHARTANIMATOR_P_H
             #include "qchartglobal.h"
             #include "chartanimation_p.h"
             #include "piechartitem_p.h"
             #include "barchartitem_p.h"
             #include <QPointF>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartItem;
             class ChartAxis;
             class AreaChartItem;
             class SplineChartItem;
             class ScatterChartItem;
             class LineChartItem;
             class XYChartItem;
             class ChartAnimator : public QObject
             {
                 Q_OBJECT
             public:
                 enum State{ShowState, ScrollUpState, ScrollDownState, ScrollLeftState, ScrollRightState, ZoomInState, ZoomOutState};
                 ChartAnimator(QObject *parent = 0);
                 virtual ~ChartAnimator();
                 void addAnimation(ChartAxis *item);
                 void addAnimation(PieChartItem *item);
                 void addAnimation(ScatterChartItem *item);
                 void addAnimation(LineChartItem *item);
                 void addAnimation(SplineChartItem *item);
                 void addAnimation(BarChartItem *item);
                 void removeAnimation(Chart *item);
                 void animationStarted();
                 void updateLayout(XYChartItem *item, QVector<QPointF> &oldLayout, QVector<QPointF> &newLayout, int index);
                 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);
                 void setState(State state,const QPointF &point = QPointF());
             private:
                  QMap<Chart *, ChartAnimation *> m_animations;
                  State m_state;
                  QPointF m_point;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/animations/pieanimation.cpp +12 -18

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "pieanimation_p.h"
             #include "piesliceanimation_p.h"
             #include "piechartitem_p.h"
             #include <QParallelAnimationGroup>
             #include <QTimer>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             PieAnimation::PieAnimation(PieChartItem *item)
                 :ChartAnimation(item),
                 m_item(item)
             {
             }
             PieAnimation::~PieAnimation()
             {
             }
             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();
                 animation->updateValue(sliceData);
                 animation->setDuration(1000);
                 animation->setEasingCurve(QEasingCurve::OutQuart);
                 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;
                 if (isEmpty)
                     startValue.m_startAngle = 0;
                 else
                     startValue.m_startAngle = sliceData.m_startAngle + (sliceData.m_angleSpan / 2);
                 startValue.m_angleSpan = 0;
                 animation->setValue(startValue, sliceData);
                 animation->setDuration(1000);
                 animation->setEasingCurve(QEasingCurve::OutQuart);
                 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->updateValue(endValue);
                 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()));
             }
             void PieAnimation::updateCurrentValue(const QVariant &)
             {
                 // 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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef PIEANIMATION_P_H
             #define PIEANIMATION_P_H
             #include "chartanimation_p.h"
             #include "piechartitem_p.h"
             #include "piesliceanimation_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class PieChartItem;
             class PieAnimation : public ChartAnimation
             {
                 Q_OBJECT
             public:
                 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
             #endif

src/animations/piesliceanimation.cpp +6 -6

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "piesliceanimation_p.h"
             #include "piechartitem_p.h"
-            #include "qpieslice.h"
             Q_DECLARE_METATYPE(QTCOMMERCIALCHART_NAMESPACE::PieSliceData)
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             qreal linearPos(qreal start, qreal end, qreal pos)
             {
                 return start + ((end - start) * pos);
             }
             QPointF linearPos(QPointF start, QPointF end, qreal pos)
             {
                 qreal x = linearPos(start.x(), end.x(), pos);
                 qreal y = linearPos(start.y(), end.y(), pos);
                 return QPointF(x, y);
             }
             QPen linearPos(QPen start, QPen end, qreal pos)
             {
                 QColor c;
                 c.setRedF(linearPos(start.color().redF(), end.color().redF(), pos));
                 c.setGreenF(linearPos(start.color().greenF(), end.color().greenF(), pos));
                 c.setBlueF(linearPos(start.color().blueF(), end.color().blueF(), pos));
                 end.setColor(c);
                 return end;
             }
             QBrush linearPos(QBrush start, QBrush end, qreal pos)
             {
                 QColor c;
                 c.setRedF(linearPos(start.color().redF(), end.color().redF(), pos));
                 c.setGreenF(linearPos(start.color().greenF(), end.color().greenF(), pos));
                 c.setBlueF(linearPos(start.color().blueF(), end.color().blueF(), pos));
                 end.setColor(c);
                 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)
             {
             }
             PieSliceAnimation::~PieSliceAnimation()
             {
             }
             void PieSliceAnimation::setValue(const PieSliceData &startValue, const PieSliceData &endValue)
             {
                 if (state() != QAbstractAnimation::Stopped)
                     stop();
                 m_currentValue = startValue;
                 setKeyValueAt(0.0, qVariantFromValue(startValue));
                 setKeyValueAt(1.0, qVariantFromValue(endValue));
             }
             void PieSliceAnimation::updateValue(const PieSliceData &endValue)
             {
                 if (state() != QAbstractAnimation::Stopped)
                     stop();
                 setKeyValueAt(0.0, qVariantFromValue(m_currentValue));
                 setKeyValueAt(1.0, qVariantFromValue(endValue));
             }
             PieSliceData PieSliceAnimation::currentSliceValue()
             {
                 // NOTE:
                 // We must use an internal current value because QVariantAnimation::currentValue() is updated
                 // before the animation is actually started. So if we get 2 updateValue() calls in a row the currentValue()
                 // will have the end value set from the first call and the second call will interpolate that instead of
                 // the original current value as it was before the first call.
                 return m_currentValue;
             }
             QVariant PieSliceAnimation::interpolated(const QVariant &start, const QVariant &end, qreal progress) const
             {
                 PieSliceData startValue = qVariantValue<PieSliceData>(start);
                 PieSliceData endValue = qVariantValue<PieSliceData>(end);
                 PieSliceData result;
                 result = endValue;
                 result.m_center = linearPos(startValue.m_center, endValue.m_center, progress);
                 result.m_radius = linearPos(startValue.m_radius, endValue.m_radius, progress);
                 result.m_startAngle = linearPos(startValue.m_startAngle, endValue.m_startAngle, progress);
                 result.m_angleSpan = linearPos(startValue.m_angleSpan, endValue.m_angleSpan, progress);
                 result.m_slicePen = linearPos(startValue.m_slicePen, endValue.m_slicePen, progress);
                 result.m_sliceBrush = linearPos(startValue.m_sliceBrush, endValue.m_sliceBrush, progress);
                 return qVariantFromValue(result);
             }
             void PieSliceAnimation::updateCurrentValue(const QVariant &value)
             {
                 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();
                 }
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/animations/piesliceanimation_p.h +3 -5

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #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);
                 PieSliceData currentSliceValue();
             protected:
                 QVariant interpolated(const QVariant &start, const QVariant &end, qreal progress) const;
                 void updateCurrentValue(const QVariant &value);
             private:
-                PieChartItem *m_item;
+                PieSliceItem *m_sliceItem;
-                QPieSlice *m_slice;
                 PieSliceData m_currentValue;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/piechart/piechartitem.cpp +22 -26

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "piechartitem_p.h"
             #include "piesliceitem_p.h"
             #include "qpieslice.h"
             #include "qpieseries.h"
             #include "qpieseries_p.h"
             #include "chartpresenter_p.h"
             #include "chartdataset_p.h"
             #include "chartanimator_p.h"
             #include <QPainter>
             #include <QTimer>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             PieChartItem::PieChartItem(QPieSeries *series, ChartPresenter* presenter)
                 :ChartItem(presenter),
                 m_series(series)
             {
                 Q_ASSERT(series);
                 QPieSeriesPrivate *d = QPieSeriesPrivate::seriesData(*series);
                 connect(d, SIGNAL(added(QList<QPieSlice*>)), this, SLOT(handleSlicesAdded(QList<QPieSlice*>)));
                 connect(d, SIGNAL(removed(QList<QPieSlice*>)), this, SLOT(handleSlicesRemoved(QList<QPieSlice*>)));
                 connect(d, SIGNAL(piePositionChanged()), this, SLOT(handlePieLayoutChanged()));
                 connect(d, SIGNAL(pieSizeChanged()), this, SLOT(handlePieLayoutChanged()));
                 QTimer::singleShot(0, this, SLOT(initialize())); // TODO: get rid of this
                 // Note: the following does not affect as long as the item does not have anything to paint
                 setZValue(ChartPresenter::PieSeriesZValue);
             }
             PieChartItem::~PieChartItem()
             {
                 // slices deleted automatically through QGraphicsItem
             }
             void PieChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
             {
                 Q_UNUSED(painter)
                 // TODO: paint shadows for all components
                 // - get paths from items & merge & offset and draw with shadow color?
                 //painter->setBrush(QBrush(Qt::red));
                 //painter->drawRect(m_debugRect);
             }
             void PieChartItem::initialize()
             {
                 handleSlicesAdded(m_series->slices());
             }
             void PieChartItem::handleSlicesAdded(QList<QPieSlice*> slices)
             {
                 bool isEmpty = m_slices.isEmpty();
                 presenter()->chartTheme()->decorate(m_series, presenter()->dataSet()->seriesIndex(m_series));
                 foreach (QPieSlice *s, slices) {
                     PieSliceItem* item = new PieSliceItem(this);
                     m_slices.insert(s, item);
                     connect(s, SIGNAL(changed()), this, SLOT(handleSliceChanged()));
                     connect(item, SIGNAL(clicked(Qt::MouseButtons)), s, SIGNAL(clicked()));
                     connect(item, SIGNAL(hovered(bool)), s, SIGNAL(hovered(bool)));
                     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);
                 }
             }
             void PieChartItem::handleSlicesRemoved(QList<QPieSlice*> slices)
             {
                 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;
                 }
             }
             void PieChartItem::handlePieLayoutChanged()
             {
                 PieLayout layout = calculateLayout();
                 applyLayout(layout);
                 update();
             }
             void PieChartItem::handleSliceChanged()
             {
                 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();
             }
             void PieChartItem::handleDomainChanged(qreal, qreal, qreal, qreal)
             {
                 // TODO
             }
             void PieChartItem::handleGeometryChanged(const QRectF& rect)
             {
                 prepareGeometryChange();
                 m_rect = rect;
                 handlePieLayoutChanged();
             }
             void PieChartItem::calculatePieLayout()
             {
                 // find pie center coordinates
                 m_pieCenter.setX(m_rect.left() + (m_rect.width() * m_series->horizontalPosition()));
                 m_pieCenter.setY(m_rect.top() + (m_rect.height() * m_series->verticalPosition()));
                 // find maximum radius for pie
                 m_pieRadius = m_rect.height() / 2;
                 if (m_rect.width() < m_rect.height())
                     m_pieRadius = m_rect.width() / 2;
                 // apply size factor
                 m_pieRadius *= m_series->pieSize();
             }
             PieSliceData PieChartItem::sliceData(QPieSlice *slice)
             {
             	// TODO: This function is kid of useless now. Refactor.
                 PieSliceData sliceData = PieSliceData::data(slice);
                 sliceData.m_center = PieSliceItem::sliceCenter(m_pieCenter, m_pieRadius, slice);
                 sliceData.m_radius = m_pieRadius;
                 return sliceData;
             }
             PieLayout PieChartItem::calculateLayout()
             {
                 calculatePieLayout();
                 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;
             }
             void PieChartItem::applyLayout(const PieLayout &layout)
             {
                 if (animator())
                     animator()->updateLayout(this, layout);
                 else
                     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"
             QTCOMMERCIALCHART_END_NAMESPACE

src/piechart/piechartitem_p.h +3 -4

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef PIECHARTITEM_H
             #define PIECHARTITEM_H
             #include "qpieseries.h"
             #include "chartitem_p.h"
             #include "piesliceitem_p.h"
             class QGraphicsItem;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QPieSlice;
             class ChartPresenter;
-            typedef QHash<QPieSlice*, PieSliceData> PieLayout;
+            typedef QHash<PieSliceItem*, PieSliceData> PieLayout;
             class PieChartItem : public ChartItem
             {
                 Q_OBJECT
             public:
                 // TODO: use a generic data class instead of x and y
                 PieChartItem(QPieSeries *series, ChartPresenter *presenter);
                 ~PieChartItem();
             public: // from QGraphicsItem
                 QRectF boundingRect() const { return m_rect; }
                 void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
             public Q_SLOTS:
                 void initialize();
                 void handleSlicesAdded(QList<QPieSlice*> slices);
                 void handleSlicesRemoved(QList<QPieSlice*> slices);
                 void handlePieLayoutChanged();
                 void handleSliceChanged();
                 void handleDomainChanged(qreal, qreal, qreal, qreal);
                 void handleGeometryChanged(const QRectF& rect);
             public:
                 void calculatePieLayout();
                 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;
                 QHash<QPieSlice*, PieSliceItem*> m_slices;
                 QPieSeries *m_series;
                 QRectF m_rect;
                 QPointF m_pieCenter;
                 qreal m_pieRadius;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // PIECHARTITEM_H

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