HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r634:5a177f3a506b

Nicer animation for adding a pie initially.

Jani Honkonen -

r634:5a177f3a506b

parent child

Context file:

r634:5a177f3a506b

src/animations/chartanimator.cpp +2 -2

                 QTimer::singleShot(0,animation,SLOT(start()));
             }
-            void ChartAnimator::addAnimation(PieChartItem* item, QPieSlice *slice, const PieSliceLayout &layout)
+            void ChartAnimator::addAnimation(PieChartItem* item, QPieSlice *slice, const PieSliceLayout &layout, bool isEmpty)
             {
                 PieAnimation* animation = static_cast<PieAnimation*>(m_animations.value(item));
                 Q_ASSERT(animation);
-                animation->addSlice(slice, layout);
+                animation->addSlice(slice, layout, isEmpty);
             }
             void ChartAnimator::removeAnimation(PieChartItem* item, QPieSlice *slice)

src/animations/chartanimator_p.h +1 -1

                 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, const PieSliceLayout &layout);
+                void addAnimation(PieChartItem* item, QPieSlice *slice, const PieSliceLayout &layout, bool isEmpty);
                 void removeAnimation(PieChartItem* item, QPieSlice *slice);
                 void updateLayout(PieChartItem* item, const PieLayout &layout);
                 void updateLayout(PieChartItem* item, QPieSlice *slice, const PieSliceLayout &layout);

src/animations/pieanimation.cpp +5 -2

                 QTimer::singleShot(0, animation, SLOT(start()));
             }
-            void PieAnimation::addSlice(QPieSlice *slice, const PieSliceLayout &endLayout)
+            void PieAnimation::addSlice(QPieSlice *slice, const PieSliceLayout &endLayout, bool isEmpty)
             {
                 PieSliceAnimation *animation = new PieSliceAnimation(m_item, slice);
                 m_animations.insert(slice, animation);
                 PieSliceLayout startLayout = endLayout;
                 startLayout.m_radius = 0;
-                startLayout.m_startAngle = endLayout.m_startAngle + (endLayout.m_angleSpan/2);
+                if (isEmpty)
+                    startLayout.m_startAngle = 0;
+                else
+                    startLayout.m_startAngle = endLayout.m_startAngle + (endLayout.m_angleSpan/2);
                 startLayout.m_angleSpan = 0;
                 animation->setValue(startLayout, endLayout);

src/animations/pieanimation_p.h +1 -1

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

src/piechart/piechartitem.cpp +3 -1

             void PieChartItem::handleSlicesAdded(QList<QPieSlice*> slices)
             {
+                bool isEmpty = m_slices.isEmpty();
                 foreach (QPieSlice *s, slices) {
                     PieSlice* slice = new PieSlice(this);
                     m_slices.insert(s, slice);
                     PieSliceLayout layout = calculateSliceLayout(s);
                     if (m_animator)
-                        m_animator->addAnimation(this, s, layout);
+                        m_animator->addAnimation(this, s, layout, isEmpty);
                     else
                         setLayout(s, layout);
                 }

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