HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r659:7d415c8db783

Fix add/remove animation for pie and apply colors from theme when adding/removing

Jani Honkonen -

r659:7d415c8db783

parent child

Context file:

r659:7d415c8db783

Collapse all files

src/animations/piesliceanimation.cpp +35 -5

                 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)
                 :QVariantAnimation(item),
                 m_item(item),
                 if (state() != QAbstractAnimation::Stopped)
                     stop();
+                m_currentValue = startValue;
                 setKeyValueAt(0.0, qVariantFromValue(startValue));
                 setKeyValueAt(1.0, qVariantFromValue(endValue));
             }
                 if (state() != QAbstractAnimation::Stopped)
                     stop();
-                setKeyValueAt(0.0, qVariantFromValue(currentSliceValue()));
+                setKeyValueAt(0.0, qVariantFromValue(m_currentValue));
                 setKeyValueAt(1.0, qVariantFromValue(endValue));
             }
             PieSliceLayout PieSliceAnimation::currentSliceValue()
             {
-                return qVariantValue<PieSliceLayout>(currentValue());
+                // 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
                 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_pen = linearPos(startValue.m_pen, endValue.m_pen, progress);
+                result.m_brush = linearPos(startValue.m_brush, endValue.m_brush, progress);
                 return qVariantFromValue(result);
             }
             void PieSliceAnimation::updateCurrentValue(const QVariant &value)
             {
-                PieSliceLayout layout = qVariantValue<PieSliceLayout>(value);
+                if (state() != QAbstractAnimation::Stopped) { //workaround
-                if (state() != QAbstractAnimation::Stopped) //workaround
+                    m_currentValue = qVariantValue<PieSliceLayout>(value);
-                    m_item->setLayout(m_slice, layout);
+                    m_item->setLayout(m_slice, m_currentValue);
+                }
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/animations/piesliceanimation_p.h +1 0

             private:
                 PieChartItem *m_item;
                 QPieSlice *m_slice;
+                PieSliceLayout m_currentValue;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/chartpresenter.cpp +1 -1

                 case QSeries::SeriesTypePie: {
                     QPieSeries *pieSeries = static_cast<QPieSeries *>(series);
-                    PieChartItem* pie = new PieChartItem(m_chart, pieSeries);
+                    PieChartItem* pie = new PieChartItem(pieSeries, this, m_chart);
                     if(m_options.testFlag(QChart::SeriesAnimations)) {
                         m_animator->addAnimation(pie);
                     }

src/chartpresenter_p.h +5 -1

                 int margin() const;
                 QRectF geometry() const;
-                ChartAnimator* animator() const {return m_animator;};
+                ChartAnimator* animator() const {return m_animator;}
+                ChartTheme *theme() { return m_chartTheme; }
+                ChartDataSet *dataSet() { return m_dataset; }
                 void setChartTheme(QChart::ChartTheme theme,bool force = true);
                 QChart::ChartTheme chartTheme();
                 void zoomOut();
                 void zoomReset();
                 void scroll(int dx,int dy);
             private:
                 void createConnections();
                 void resetAllElements();

src/piechart/piechartitem.cpp +10 -2

             #include "qpieslice.h"
             #include "qpieseries.h"
             #include "chartpresenter_p.h"
+            #include "chartdataset_p.h"
             #include "chartanimator_p.h"
             #include <QDebug>
             #include <QPainter>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            PieChartItem::PieChartItem(QGraphicsItem *parent, QPieSeries *series)
+            PieChartItem::PieChartItem(QPieSeries *series, ChartPresenter *presenter, QGraphicsItem *parent)
                 :ChartItem(parent),
-                m_series(series)
+                m_series(series),
+                m_presenter(presenter)
             {
                 Q_ASSERT(series);
                 connect(series, SIGNAL(added(QList<QPieSlice*>)), this, SLOT(handleSlicesAdded(QList<QPieSlice*>)));
             {
                 bool isEmpty = m_slices.isEmpty();
+                m_presenter->theme()->decorate(m_series, m_presenter->dataSet()->seriesIndex(m_series));
                 foreach (QPieSlice *s, slices) {
                     PieSlice* slice = new PieSlice(this);
                     m_slices.insert(s, slice);
             void PieChartItem::handleSlicesRemoved(QList<QPieSlice*> slices)
             {
+                m_presenter->theme()->decorate(m_series, m_presenter->dataSet()->seriesIndex(m_series));
                 foreach (QPieSlice *s, slices) {
                     if (m_animator)
                         m_animator->removeAnimation(this, s);
                 sliceLayout.m_radius = m_pieRadius;
                 sliceLayout.m_startAngle = slice->startAngle();
                 sliceLayout.m_angleSpan = slice->m_angleSpan;
+                sliceLayout.m_pen = slice->m_slicePen;
+                sliceLayout.m_brush = slice->m_sliceBrush;
                 return sliceLayout;
             }

src/piechart/piechartitem_p.h +3 -2

             class QGraphicsItem;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QPieSlice;
+            class ChartPresenter;
             typedef QHash<QPieSlice*, PieSliceLayout> PieLayout;
             public:
                 // TODO: use a generic data class instead of x and y
-                PieChartItem(QGraphicsItem *parent, QPieSeries *series);
+                PieChartItem(QPieSeries *series, ChartPresenter *presenter, QGraphicsItem *parent);
                 ~PieChartItem();
             public: // from QGraphicsItem
                 QRectF m_rect;
                 QPointF m_pieCenter;
                 qreal m_pieRadius;
-                QRectF m_debugRect;
+                ChartPresenter *m_presenter;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/piechart/pieslice.cpp +2 -4

                 painter->setClipRect(parentItem()->boundingRect());
                 painter->save();
-                painter->setPen(m_slicePen);
+                painter->setPen(m_layout.m_pen);
-                painter->setBrush(m_sliceBrush);
+                painter->setBrush(m_layout.m_brush);
                 painter->drawPath(m_slicePath);
                 painter->restore();
                 m_isExploded = sliceData->isExploded();
                 m_explodeDistanceFactor = sliceData->explodeDistanceFactor();
-                m_slicePen = sliceData->slicePen();
-                m_sliceBrush = sliceData->sliceBrush();
                 m_labelVisible = sliceData->isLabelVisible();
                 m_labelText = sliceData->label();

src/piechart/pieslice_p.h +2 -2

                 qreal m_radius;
                 qreal m_startAngle;
                 qreal m_angleSpan;
+                QPen m_pen;
+                QBrush m_brush;
             };
             class PieSlice : public QGraphicsObject
                 bool m_isExploded;
                 qreal m_explodeDistanceFactor;
                 bool m_labelVisible;
-                QPen m_slicePen;
-                QBrush m_sliceBrush;
                 QPainterPath m_labelArmPath;
                 qreal m_labelArmLengthFactor;

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