HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2555:8f0e18a7e02c

Fix resetting animation options mid-animation....

Miikka Heikkinen -

r2555:8f0e18a7e02c

parent child

Context file:

r2555:8f0e18a7e02c

Collapse all files

src/animations/chartanimation.cpp created 644 +46 0

@@ -0,0 +1,46
	1	/****************************************************************************
	2	**
	3	** Copyright (C) 2013 Digia Plc
	4	** All rights reserved.
	5	** For any questions to Digia, please use contact form at http://qt.digia.com
	6	**
	7	** This file is part of the Qt Commercial Charts Add-on.
	8	**
	9	** $QT_BEGIN_LICENSE$
	10	** Licensees holding valid Qt Commercial licenses may use this file in
	11	** accordance with the Qt Commercial License Agreement provided with the
	12	** Software or, alternatively, in accordance with the terms contained in
	13	** a written agreement between you and Digia.
	14	**
	15	** If you have questions regarding the use of this file, please use
	16	** contact form at http://qt.digia.com
	17	** $QT_END_LICENSE$
	18	**
	19	****************************************************************************/
	20
	21	#include "chartanimation_p.h"
	22
	23	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	24
	25	ChartAnimation::ChartAnimation(QObject *parent) :
	26	QVariantAnimation(parent),
	27	m_destructing(false)
	28	{
	29	}
	30
	31	void ChartAnimation::stopAndDestroyLater()
	32	{
	33	m_destructing = true;
	34	stop();
	35	deleteLater();
	36	}
	37
	38	void ChartAnimation::startChartAnimation()
	39	{
	40	if (!m_destructing)
	41	start();
	42	}
	43
	44	QTCOMMERCIALCHART_END_NAMESPACE
	45
	46

src/animations/animations.pri +2 -1

                 $$PWD/baranimation.cpp \
                 $$PWD/scatteranimation.cpp \
                 $$PWD/boxplotanimation.cpp \
-                $$PWD/boxwhiskersanimation.cpp
+                $$PWD/boxwhiskersanimation.cpp \
+                $$PWD/chartanimation.cpp
             PRIVATE_HEADERS += \
                 $$PWD/axisanimation_p.h \

src/animations/chartanimation_p.h +9 -1

@@ -41,7 +41,15 class ChartAnimation: public QVariantAnimation
41	{	41	{
42	Q_OBJECT	42	Q_OBJECT
43	public:	43	public:
44	ChartAnimation(QObject *parent = 0): ~~QVariantAnimation~~(~~parent~~) {};	44	ChartAnimation(QObject *parent = 0);
		45
		46	void stopAndDestroyLater();
		47
		48	public Q_SLOTS:
		49	void startChartAnimation();
		50
		51	protected:
		52	bool m_destructing;
45	};	53	};
46		54
47	QTCOMMERCIALCHART_END_NAMESPACE	55	QTCOMMERCIALCHART_END_NAMESPACE

src/areachart/qareaseries.cpp +8 -2

             {
                 Q_Q(QAreaSeries);
                 AreaChartItem *area = static_cast<AreaChartItem *>(m_item.data());
+                if (area->upperLineItem()->animation())
+                    area->upperLineItem()->animation()->stopAndDestroyLater();
+                if (q->lowerSeries() && area->lowerLineItem()->animation())
+                    area->lowerLineItem()->animation()->stopAndDestroyLater();
                 if (options.testFlag(QChart::SeriesAnimations)) {
                     area->upperLineItem()->setAnimation(new XYAnimation(area->upperLineItem()));
                     if (q->lowerSeries())
-                    area->lowerLineItem()->setAnimation(new XYAnimation(area->lowerLineItem()));
+                        area->lowerLineItem()->setAnimation(new XYAnimation(area->lowerLineItem()));
-                }else{
+                } else {
                     area->upperLineItem()->setAnimation(0);
                     if (q->lowerSeries())
                            area->lowerLineItem()->setAnimation(0);

src/axis/qabstractaxis.cpp +5 -3

             {
                 ChartAxisElement *axis = m_item.data();
                 Q_ASSERT(axis);
-                if (options.testFlag(QChart::GridAxisAnimations)) {
+                if (axis->animation())
+                    axis->animation()->stopAndDestroyLater();
+                if (options.testFlag(QChart::GridAxisAnimations))
                     axis->setAnimation(new AxisAnimation(axis));
-                } else {
+                else
                     axis->setAnimation(0);
             }

src/barchart/qabstractbarseries.cpp +5 -3

             {
                 AbstractBarChartItem *bar = static_cast<AbstractBarChartItem *>(m_item.data());
                 Q_ASSERT(bar);
-                if (options.testFlag(QChart::SeriesAnimations)) {
+                if (bar->animation())
+                    bar->animation()->stopAndDestroyLater();
+                if (options.testFlag(QChart::SeriesAnimations))
                     bar->setAnimation(new BarAnimation(bar));
-                }else{
+                else
                     bar->setAnimation(0);
                 QAbstractSeriesPrivate::initializeAnimations(options);
             }

src/boxplotchart/qboxplotseries.cpp +4 -1

             {
                 BoxPlotChartItem *item = static_cast<BoxPlotChartItem *>(m_item.data());
                 Q_ASSERT(item);
+                if (item->animation())
+                    item->animation()->stopAndDestroyLater();
                 if (options.testFlag(QChart::SeriesAnimations))
                     item->setAnimation(new BoxPlotAnimation(item));
                 else
-                    item->setAnimation((BoxPlotAnimation *)0);
+                    item->setAnimation(0);
                 QAbstractSeriesPrivate::initializeAnimations(options);
             }

src/chartpresenter.cpp +10 -18

             void ChartPresenter::setAnimationOptions(QChart::AnimationOptions options)
             {
                 if (m_options != options) {
+                    QChart::AnimationOptions oldOptions = m_options;
                     m_options = options;
+                    if (options.testFlag(QChart::SeriesAnimations) != oldOptions.testFlag(QChart::SeriesAnimations)) {
-                    foreach(QAbstractSeries* series, m_series){
+                        foreach (QAbstractSeries *series, m_series)
-                        series->d_ptr->initializeAnimations(m_options);
+                            series->d_ptr->initializeAnimations(m_options);
                     }
-                    foreach(QAbstractAxis* axis, m_axes){
+                    if (options.testFlag(QChart::GridAxisAnimations) != oldOptions.testFlag(QChart::GridAxisAnimations)) {
-                        axis->d_ptr->initializeAnimations(m_options);
+                        foreach (QAbstractAxis *axis, m_axes)
+                            axis->d_ptr->initializeAnimations(m_options);
                     }
+                    m_layout->invalidate(); // So that existing animations don't just stop halfway
                 }
             }
                 }
             }
-            void ChartPresenter::handleAnimationFinished()
-                m_animations.removeAll(qobject_cast<ChartAnimation *>(sender()));
-                if (m_animations.empty())
-                    emit animationsFinished();
             void ChartPresenter::startAnimation(ChartAnimation *animation)
             {
-                if (animation->state() != QAbstractAnimation::Stopped) animation->stop();
+                animation->stop();
-                QObject::connect(animation, SIGNAL(finished()), this, SLOT(handleAnimationFinished()), Qt::UniqueConnection);
+                QTimer::singleShot(0, animation, SLOT(startChartAnimation()));
-                if (!m_animations.isEmpty())
-                    m_animations.append(animation);
-                QTimer::singleShot(0, animation, SLOT(start()));
             }
             void ChartPresenter::setBackgroundBrush(const QBrush &brush)

src/chartpresenter_p.h 0 -7

                 void handleAxisAdded(QAbstractAxis *axis);
                 void handleAxisRemoved(QAbstractAxis *axis);
-            private Q_SLOTS:
-                void handleAnimationFinished();
-            Q_SIGNALS:
-                void animationsFinished();
             private:
                 QChart *m_chart;
                 QList<ChartItem *> m_chartItems;
                 QChart::AnimationOptions m_options;
                 State m_state;
                 QPointF m_statePoint;
-                QList<ChartAnimation *> m_animations;
                 AbstractChartLayout *m_layout;
                 ChartBackground *m_background;
                 QAbstractGraphicsShapeItem *m_plotAreaBackground;

src/piechart/qpieseries.cpp +5 -3

             {
                 PieChartItem *item = static_cast<PieChartItem *>(m_item.data());
                 Q_ASSERT(item);
-                if (options.testFlag(QChart::SeriesAnimations)) {
+                if (item->animation())
+                    item->animation()->stopAndDestroyLater();
+                if (options.testFlag(QChart::SeriesAnimations))
                     item->setAnimation(new PieAnimation(item));
-                }else{
+                else
                     item->setAnimation(0);
                 QAbstractSeriesPrivate::initializeAnimations(options);
             }

src/scatterchart/qscatterseries.cpp +3 0

                 ScatterChartItem *item = static_cast<ScatterChartItem *>(m_item.data());
                 Q_ASSERT(item);
+                if (item->animation())
+                    item->animation()->stopAndDestroyLater();
                 if (options.testFlag(QChart::SeriesAnimations))
                     item->setAnimation(new ScatterAnimation(item));
                 else

src/splinechart/qsplineseries.cpp +5 -3

             {
                 SplineChartItem *item = static_cast<SplineChartItem *>(m_item.data());
                 Q_ASSERT(item);
-                if (options.testFlag(QChart::SeriesAnimations)) {
+                if (item->animation())
+                    item->animation()->stopAndDestroyLater();
+                if (options.testFlag(QChart::SeriesAnimations))
                     item->setAnimation(new SplineAnimation(item));
-                }else{
+                else
                     item->setAnimation(0);
                 QAbstractSeriesPrivate::initializeAnimations(options);
             }

src/xychart/qxyseries.cpp +5 -3

             {
                 XYChart *item = static_cast<XYChart *>(m_item.data());
                 Q_ASSERT(item);
-                if (options.testFlag(QChart::SeriesAnimations)) {
+                if (item->animation())
+                    item->animation()->stopAndDestroyLater();
+                if (options.testFlag(QChart::SeriesAnimations))
                     item->setAnimation(new XYAnimation(item));
-                }else{
+                else
                     item->setAnimation(0);
                 QAbstractSeriesPrivate::initializeAnimations(options);
             }

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