HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2560:a2f72685ff33

Fix box-and-whiskers animations...

Miikka Heikkinen -

r2560:a2f72685ff33

parent child

Context file:

r2560:a2f72685ff33

src/animations/boxplotanimation.cpp +8 -1

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             BoxPlotAnimation::BoxPlotAnimation(BoxPlotChartItem *item)
-                  : m_item(item)
+                : QObject(item),
+                m_item(item)
             {
             }
                 animation->setStartData(box->m_data);
             }
+            void BoxPlotAnimation::stopAll()
+            {
+                foreach (BoxWhiskersAnimation *animation, m_animations.values())
+                    animation->stopAndDestroyLater();
+            }
             //#include "moc_boxplotanimation_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/animations/boxplotanimation_p.h +3 -1

             class BoxPlotChartItem;
-            class BoxPlotAnimation
+            class BoxPlotAnimation : public QObject
             {
+                Q_OBJECT
             public:
                 BoxPlotAnimation(BoxPlotChartItem *item);
                 ~BoxPlotAnimation();
                 ChartAnimation *boxChangeAnimation(BoxWhiskers *box);
                 void setAnimationStart(BoxWhiskers *box);
+                void stopAll();
             protected:
                 BoxPlotChartItem *m_item;

src/animations/boxwhiskersanimation_p.h 0 -2

             protected:
                 friend class BoxPlotAnimation;
-                BoxPlotChartItem *m_item;
                 BoxWhiskers *m_box;
-                BoxWhiskersData *m_boxData;
                 bool m_moveMedianLine;
             };

src/boxplotchart/boxplotchartitem.cpp +1 -2

             BoxPlotChartItem::BoxPlotChartItem(QBoxPlotSeries *series, QGraphicsItem *item) :
                 ChartItem(series->d_func(), item),
                 m_series(series),
-                m_animation(0),
+                m_animation(0)
-                m_animate(0)
             {
                 connect(series, SIGNAL(boxsetsRemoved(QList<QBoxSet *>)), this, SLOT(handleBoxsetRemove(QList<QBoxSet *>)));
                 connect(series->d_func(), SIGNAL(restructuredBoxes()), this, SLOT(handleDataStructureChanged()));

src/boxplotchart/boxplotchartitem_p.h 0 -1

                 int m_seriesCount;
                 BoxPlotAnimation *m_animation;
-                bool m_animate;
                 QRectF m_boundingRect;
             };

src/boxplotchart/qboxplotseries.cpp +9 -3

                     item->animation()->stopAndDestroyLater();
                 if (options.testFlag(QChart::SeriesAnimations))
-                    item->setAnimation(new BoxPlotAnimation(item));
+                    m_animation = new BoxPlotAnimation(item);
                 else
-                    item->setAnimation(0);
+                    m_animation = 0;
+                item->setAnimation(m_animation);
                 QAbstractSeriesPrivate::initializeAnimations(options);
             }
                 Q_Q(QBoxPlotSeries);
                 QBoxPlotSeries *removedSeries = static_cast<QBoxPlotSeries *>(series);
-                QObject::disconnect(m_chart->d_ptr->m_dataset, 0, removedSeries->d_func(), 0);
+                if (q == removedSeries && m_animation) {
+                    m_animation->stopAll();
+                    QObject::disconnect(m_chart->d_ptr->m_dataset, 0, removedSeries->d_func(), 0);
+                }
                 // Test if series removed is me, then don't do anything
                 if (q != removedSeries) {

src/boxplotchart/qboxplotseries_p.h +3 0

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
+            class BoxPlotAnimation;
             class QBoxPlotSeriesPrivate : public QAbstractSeriesPrivate
             {
                 Q_OBJECT
                 QPen m_pen;
                 QBrush m_brush;
                 int m_index;
+                BoxPlotAnimation *m_animation;
             private:
                 Q_DECLARE_PUBLIC(QBoxPlotSeries)

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