HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r629:54034d98d5c4

Getting rid of slice pointer in PieSliceLayout.

Jani Honkonen -

r629:54034d98d5c4

parent child

Context file:

r629:54034d98d5c4

Collapse all files

src/animations/chartanimator.cpp +4 -4

                 QTimer::singleShot(0,animation,SLOT(start()));
             }
-            void ChartAnimator::addAnimation(PieChartItem* item, QPieSlice *slice, PieSliceLayout &layout)
+            void ChartAnimator::addAnimation(PieChartItem* item, QPieSlice *slice, const PieSliceLayout &layout)
             {
                 PieAnimation* animation = static_cast<PieAnimation*>(m_animations.value(item));
                 Q_ASSERT(animation);
                 animation->removeSlice(slice);
             }
-            void ChartAnimator::updateLayout(PieChartItem* item, QVector<PieSliceLayout> &layout)
+            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, PieSliceLayout &layout)
+            void ChartAnimator::updateLayout(PieChartItem* item, QPieSlice *slice, const PieSliceLayout &layout)
             {
                 PieAnimation* animation = static_cast<PieAnimation*>(m_animations.value(item));
                 Q_ASSERT(animation);
-                animation->updateValue(layout);
+                animation->updateValue(slice, layout);
             }
             void ChartAnimator::setState(State state,const QPointF& point)

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 applyLayout(AxisItem* item, QVector<qreal>& layout);
-                void addAnimation(PieChartItem* item, QPieSlice *slice, PieSliceLayout &layout);
+                void addAnimation(PieChartItem* item, QPieSlice *slice, const PieSliceLayout &layout);
                 void removeAnimation(PieChartItem* item, QPieSlice *slice);
-                void updateLayout(PieChartItem* item, QVector<PieSliceLayout> &layout);
+                void updateLayout(PieChartItem* item, const PieLayout &layout);
-                void updateLayout(PieChartItem* item, PieSliceLayout &layout);
+                void updateLayout(PieChartItem* item, QPieSlice *slice, const PieSliceLayout &layout);
                 void setState(State state,const QPointF& point = QPointF());

src/animations/pieanimation.cpp +7 -7

             {
             }
-            void PieAnimation::updateValues(QVector<PieSliceLayout>& newValues)
+            void PieAnimation::updateValues(const PieLayout &newValues)
             {
-                foreach (PieSliceLayout endLayout, newValues)
+                foreach (QPieSlice* s, newValues.keys())
-                    updateValue(endLayout);
+                    updateValue(s, newValues.value(s));
             }
-            void PieAnimation::updateValue(PieSliceLayout& endLayout)
+            void PieAnimation::updateValue(QPieSlice *slice, const PieSliceLayout &endLayout)
             {
-                PieSliceAnimation *animation = m_animations.value(endLayout.m_data);
+                PieSliceAnimation *animation = m_animations.value(slice);
                 Q_ASSERT(animation);
                 animation->stop();
                 QTimer::singleShot(0, animation, SLOT(start()));
             }
-            void PieAnimation::addSlice(QPieSlice *slice, PieSliceLayout endLayout)
+            void PieAnimation::addSlice(QPieSlice *slice, const PieSliceLayout &endLayout)
             {
-                PieSliceAnimation *animation = new PieSliceAnimation(m_item);
+                PieSliceAnimation *animation = new PieSliceAnimation(m_item, slice);
                 m_animations.insert(slice, animation);
                 PieSliceLayout startLayout = endLayout;

src/animations/pieanimation_p.h +3 -3

             public:
                 PieAnimation(PieChartItem *item);
                 ~PieAnimation();
-                void updateValues(QVector<PieSliceLayout>& newValues);
+                void updateValues(const PieLayout &newValues);
-                void updateValue(PieSliceLayout& newValue);
+                void updateValue(QPieSlice *slice, const PieSliceLayout &newValue);
-                void addSlice(QPieSlice *slice, PieSliceLayout endLayout);
+                void addSlice(QPieSlice *slice, const PieSliceLayout &endLayout);
                 void removeSlice(QPieSlice *slice);
             public: // from QVariantAnimation

src/animations/piesliceanimation.cpp +6 -7

                 return QPointF(x, y);
             }
-            PieSliceAnimation::PieSliceAnimation(PieChartItem *item)
+            PieSliceAnimation::PieSliceAnimation(PieChartItem *item, QPieSlice *slice)
                 :QVariantAnimation(item),
-                m_item(item)
+                m_item(item),
+                m_slice(slice)
             {
             }
             {
             }
-            void PieSliceAnimation::setValue(PieSliceLayout& startValue, PieSliceLayout& endValue)
+            void PieSliceAnimation::setValue(const PieSliceLayout &startValue, const PieSliceLayout &endValue)
             {
                 if (state() != QAbstractAnimation::Stopped)
                     stop();
                 setKeyValueAt(1.0, qVariantFromValue(endValue));
             }
-            void PieSliceAnimation::updateValue(PieSliceLayout& endValue)
+            void PieSliceAnimation::updateValue(const PieSliceLayout &endValue)
             {
                 if (state() != QAbstractAnimation::Stopped)
                     stop();
-                //qDebug() << "PieSliceAnimation::updateValue()" << endValue.m_data->label() << currentSliceValue().m_startAngle << endValue.m_startAngle;
                 setKeyValueAt(0.0, qVariantFromValue(currentSliceValue()));
                 setKeyValueAt(1.0, qVariantFromValue(endValue));
             }
             {
                 PieSliceLayout layout = qVariantValue<PieSliceLayout>(value);
                 if (state() != QAbstractAnimation::Stopped) //workaround
-                    m_item->setLayout(layout);
+                    m_item->setLayout(m_slice, layout);
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/animations/piesliceanimation_p.h +5 -3

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class PieChartItem;
+            class QPieSlice;
             class PieSliceAnimation : public QVariantAnimation
             {
             public:
-                PieSliceAnimation(PieChartItem *item);
+                PieSliceAnimation(PieChartItem *item, QPieSlice *slice);
                 ~PieSliceAnimation();
-                void setValue(PieSliceLayout& startValue, PieSliceLayout& endValue);
+                void setValue(const PieSliceLayout &startValue, const PieSliceLayout &endValue);
-                void updateValue(PieSliceLayout& endValue);
+                void updateValue(const PieSliceLayout &endValue);
                 PieSliceLayout currentSliceValue();
             protected:
             private:
                 PieChartItem *m_item;
+                QPieSlice *m_slice;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/piechart/piechartitem.cpp +26 -27

                     if (m_animator)
                         m_animator->addAnimation(this, s, layout);
                     else
-                        setLayout(layout);
+                        setLayout(s, layout);
                 }
             }
             void PieChartItem::handlePieLayoutChanged()
             {
-                QVector<PieSliceLayout> layout = calculateLayout();
+                PieLayout layout = calculateLayout();
                 applyLayout(layout);
                 update();
             }
                 QPieSlice* slice = qobject_cast<QPieSlice *>(sender());
                 Q_ASSERT(m_slices.contains(slice));
                 PieSliceLayout layout = calculateSliceLayout(slice);
-                updateLayout(layout);
+                updateLayout(slice, layout);
                 update();
             }
             PieSliceLayout PieChartItem::calculateSliceLayout(QPieSlice *slice)
             {
                 PieSliceLayout sliceLayout;
-                sliceLayout.m_data = slice;
                 sliceLayout.m_center = PieSlice::sliceCenter(m_pieCenter, m_pieRadius, slice);
                 sliceLayout.m_radius = m_pieRadius;
                 sliceLayout.m_startAngle = slice->startAngle();
                 return sliceLayout;
             }
-            QVector<PieSliceLayout> PieChartItem::calculateLayout()
+            PieLayout PieChartItem::calculateLayout()
             {
                 calculatePieLayout();
-                QVector<PieSliceLayout> layout;
+                PieLayout  layout;
                 foreach (QPieSlice* s, m_series->slices()) {
                     if (m_slices.contains(s)) // calculate layout only for those slices that are already visible
-                        layout << calculateSliceLayout(s);
+                        layout.insert(s, calculateSliceLayout(s));
                 }
                 return layout;
             }
-            void PieChartItem::applyLayout(QVector<PieSliceLayout> &layout)
+            void PieChartItem::applyLayout(const PieLayout &layout)
             {
                 if (m_animator)
                     m_animator->updateLayout(this, layout);
                     setLayout(layout);
             }
-            void PieChartItem::updateLayout(PieSliceLayout &layout)
+            void PieChartItem::updateLayout(QPieSlice *slice, const PieSliceLayout &layout)
             {
                 if (m_animator)
-                    m_animator->updateLayout(this, layout);
+                    m_animator->updateLayout(this, slice, layout);
                 else
-                    setLayout(layout);
+                    setLayout(slice, layout);
             }
-            void PieChartItem::setLayout(QVector<PieSliceLayout> &layout)
+            void PieChartItem::setLayout(const PieLayout &layout)
             {
-                foreach (PieSliceLayout l, layout) {
+                foreach (QPieSlice *slice, layout.keys()) {
-                    PieSlice *slice = m_slices.value(l.m_data);
+                    PieSlice *s = m_slices.value(slice);
-                    Q_ASSERT(slice);
+                    Q_ASSERT(s);
-                    slice->setLayout(l);
+                    s->setLayout(layout.value(slice));
-                    slice->updateData(l.m_data);
+                    s->updateData(slice);
-                    slice->updateGeometry();
+                    s->updateGeometry();
-                    slice->update();
+                    s->update();
                 }
             }
-            void PieChartItem::setLayout(PieSliceLayout &layout)
+            void PieChartItem::setLayout(QPieSlice *slice, const PieSliceLayout &layout)
             {
                 // find slice
-                PieSlice *slice = m_slices.value(layout.m_data);
+                PieSlice *s = m_slices.value(slice);
-                Q_ASSERT(slice);
+                Q_ASSERT(s);
-                slice->setLayout(layout);
+                s->setLayout(layout);
-                if (m_series->m_slices.contains(layout.m_data)) // Slice has been deleted if not found. Animations ongoing...
+                if (m_series->m_slices.contains(slice)) // Slice has been deleted if not found. Animations ongoing...
-                    slice->updateData(layout.m_data);
+                    s->updateData(slice);
-                slice->updateGeometry();
+                s->updateGeometry();
-                slice->update();
+                s->update();
             }
             void PieChartItem::destroySlice(QPieSlice *slice)

src/piechart/piechartitem_p.h +7 -5

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QPieSlice;
+            typedef QHash<QPieSlice*, PieSliceLayout> PieLayout;
             class PieChartItem : public QObject, public ChartItem
             {
                 Q_OBJECT
             public:
                 void calculatePieLayout();
                 PieSliceLayout calculateSliceLayout(QPieSlice *slice);
-                QVector<PieSliceLayout> calculateLayout();
+                PieLayout calculateLayout();
-                void applyLayout(QVector<PieSliceLayout> &layout);
+                void applyLayout(const PieLayout &layout);
-                void updateLayout(PieSliceLayout &layout);
+                void updateLayout(QPieSlice *slice, const PieSliceLayout &layout);
-                void setLayout(QVector<PieSliceLayout> &layout);
+                void setLayout(const PieLayout &layout);
-                void setLayout(PieSliceLayout &layout);
+                void setLayout(QPieSlice *slice, const PieSliceLayout &layout);
                 void destroySlice(QPieSlice *slice);
             private:

src/piechart/pieslice_p.h 0 -1

             class PieSliceLayout
             {
             public:
-                QPieSlice* m_data; // TODO: get rid of this
                 QPointF m_center;
                 qreal m_radius;
                 qreal m_startAngle;

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