HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2492:5a6d23b6b72f

Further animation fixes...

Miikka Heikkinen -

r2492:5a6d23b6b72f

parent child

Context file:

r2492:5a6d23b6b72f

Collapse all files

src/animations/scatteranimation.cpp created 644 +50 0

@@ -0,0 +1,50
	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 "scatteranimation_p.h"
	22	#include "scatterchartitem_p.h"
	23	#include <QDebug>
	24
	25	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	26
	27	ScatterAnimation::ScatterAnimation(ScatterChartItem *item)
	28	: XYAnimation(item)
	29	{
	30	}
	31
	32	ScatterAnimation::~ScatterAnimation()
	33	{
	34	}
	35
	36	void ScatterAnimation::updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState)
	37	{
	38	XYAnimation::updateState(newState, oldState);
	39
	40	if (oldState == QAbstractAnimation::Running && newState == QAbstractAnimation::Stopped
	41	&& animationType() == RemovePointAnimation) {
	42	// Removing a point from scatter chart will keep extra marker item after animation stops.
	43	// Also, if the removed point was not the last one in series, points after the removed one
	44	// will report wrong coordinates when clicked. To fix these issues, update geometry after
	45	// point removal animation has finished.
	46	chartItem()->updateGeometry();
	47	}
	48	}
	49
	50	QTCOMMERCIALCHART_END_NAMESPACE

src/animations/scatteranimation_p.h created 644 +50 0

@@ -0,0 +1,50
	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	// W A R N I N G
	22	// -------------
	23	//
	24	// This file is not part of the QtCommercial Chart API. It exists purely as an
	25	// implementation detail. This header file may change from version to
	26	// version without notice, or even be removed.
	27	//
	28	// We mean it.
	29
	30	#ifndef SCATTERANIMATION_P_H
	31	#define SCATTERANIMATION_P_H
	32	#include "xyanimation_p.h"
	33
	34	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	35
	36	class ScatterChartItem;
	37
	38	class ScatterAnimation : public XYAnimation
	39	{
	40	public:
	41	ScatterAnimation(ScatterChartItem *item);
	42	~ScatterAnimation();
	43
	44	protected:
	45	void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState);
	46	};
	47
	48	QTCOMMERCIALCHART_END_NAMESPACE
	49
	50	#endif

src/animations/animations.pri +4 -2

                 $$PWD/pieanimation.cpp \
                 $$PWD/piesliceanimation.cpp \
                 $$PWD/splineanimation.cpp \
-                $$PWD/baranimation.cpp
+                $$PWD/baranimation.cpp \
+                $$PWD/scatteranimation.cpp
             PRIVATE_HEADERS += \
                 $$PWD/axisanimation_p.h \
                 $$PWD/pieanimation_p.h \
                 $$PWD/piesliceanimation_p.h \
                 $$PWD/splineanimation_p.h \
-                $$PWD/baranimation_p.h
+                $$PWD/baranimation_p.h \
+                $$PWD/scatteranimation_p.h

src/animations/splineanimation.cpp +15 -9

                         m_newSpline.second.insert((index - 1) * 2, newPoints[index - 1]);
                         m_newSpline.second.insert((index - 1) * 2 + 1, newPoints[index - 1]);
                     } else {
-                        m_newSpline.first.insert(index, newPoints[index]);
+                        m_newSpline.first.insert(0, newPoints[index]);
-                        m_newSpline.second.insert(index * 2, newPoints[index]);
+                        m_newSpline.second.insert(0, newPoints[index]);
-                        m_newSpline.second.insert(index * 2 + 1, newPoints[index]);
+                        m_newSpline.second.insert(1, newPoints[index]);
                     }
                     m_index = index;
                     m_type = RemovePointAnimation;
                         m_oldSpline.second.insert((index - 1) * 2, newPoints[index - 1]);
                         m_oldSpline.second.insert((index - 1) * 2 + 1, newPoints[index - 1]);
                     } else {
-                        m_oldSpline.first.insert(index, newPoints[index]);
+                        m_oldSpline.first.insert(0, newPoints[index]);
-                        m_oldSpline.second.insert((index - 1) * 2, newPoints[index]);
+                        m_oldSpline.second.insert(0, newPoints[index]);
-                        m_oldSpline.second.insert((index - 1) * 2 + 1, newPoints[index]);
+                        m_oldSpline.second.insert(1, newPoints[index]);
                     }
                     m_index = index;
                     m_type = AddPointAnimation;
                 if (oldState == QAbstractAnimation::Running && newState == QAbstractAnimation::Stopped) {
                     if (m_item->isDirty() && m_type == RemovePointAnimation) {
                         if (!m_newSpline.first.isEmpty()) {
-                            m_newSpline.first.remove(m_index);
+                            if (m_index) {
-                            m_newSpline.second.remove((m_index - 1) * 2);
+                                m_newSpline.first.remove(m_index);
-                            m_newSpline.second.remove((m_index - 1) * 2);
+                                m_newSpline.second.remove((m_index - 1) * 2);
+                                m_newSpline.second.remove((m_index - 1) * 2);
+                            } else {
+                                m_newSpline.first.remove(0);
+                                m_newSpline.second.remove(0);
+                                m_newSpline.second.remove(0);
+                            }
                         }
                         m_item->setGeometryPoints(m_newSpline.first);
                         m_item->setControlGeometryPoints(m_newSpline.second);

src/animations/xyanimation_p.h +1 0

                 QVariant interpolated(const QVariant &start, const QVariant &end, qreal progress) const;
                 void updateCurrentValue(const QVariant &value);
                 void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState);
+                XYChart *chartItem() { return m_item; }
             protected:
                 Animation m_type;
                 bool m_dirty;

src/scatterchart/qscatterseries.cpp +14 0

             #include "scatterchartitem_p.h"
             #include "chartdataset_p.h"
             #include "charttheme_p.h"
+            #include "scatteranimation_p.h"
             /*!
                 \class QScatterSeries
                 }
             }
+            void QScatterSeriesPrivate::initializeAnimations(QChart::AnimationOptions options)
+            {
+                ScatterChartItem *item = static_cast<ScatterChartItem *>(m_item.data());
+                Q_ASSERT(item);
+                if (options.testFlag(QChart::SeriesAnimations))
+                    item->setAnimation(new ScatterAnimation(item));
+                else
+                    item->setAnimation(0);
+                QAbstractSeriesPrivate::initializeAnimations(options);
+            }
             #include "moc_qscatterseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/scatterchart/qscatterseries_p.h +1 0

                 QScatterSeriesPrivate(QScatterSeries *q);
                 void initializeGraphics(QGraphicsItem* parent);
                 void initializeTheme(int index, ChartTheme* theme, bool forced = false);
+                void initializeAnimations(QtCommercialChart::QChart::AnimationOptions options);
             private:
                 QScatterSeries::MarkerShape m_shape;

src/scatterchart/scatterchartitem.cpp +2 -2

                     QGraphicsItem *item = items.at(i);
                     const QPointF &point = points.at(i);
                     const QRectF &rect = item->boundingRect();
-                    // During remove/append animation series may have different number of points,
+                    // During remove animation series may have different number of points,
                     // so ensure we don't go over the index. Animation handling itself ensures that
                     // if there is actually no points in the series, then it won't generate a fake point,
                     // so we can be assured there is always at least one point in m_series here.
                     // Note that marker map values can be technically incorrect during the animation,
                     // if it was caused by an insert, but this shouldn't be a problem as the points are
-                    // fake anyway.
+                    // fake anyway. After remove animation stops, geometry is updated to correct one.
                     m_markerMap[item] = m_series->at(qMin(seriesLastIndex, i));
                     item->setPos(point.x() - rect.width() / 2, point.y() - rect.height() / 2);

src/xychart/xychart.cpp +1 -1

                 QVector<bool> returnVector;
                 returnVector.resize(m_points.size());
-                // During remove/append animation series may have different number of points,
+                // During remove animation series may have different number of points,
                 // so ensure we don't go over the index. No need to check for zero points, this
                 // will not be called in such a situation.
                 const int seriesLastIndex = m_series->count() - 1;

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