HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1271:b11722f80588

adds QLineAnimation fixes

Michal Klocek -

r1271:b11722f80588

parent child

Context file:

r1271:b11722f80588

Collapse all files

src/animations/splineanimation.cpp +1 -1

             {
             }
-            void SplineAnimation::setValues(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, QVector<QPointF> &oldControlPoints, QVector<QPointF> &newControlPoints, int index)
+            void SplineAnimation::setup(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, QVector<QPointF> &oldControlPoints, QVector<QPointF> &newControlPoints, int index)
             {
                 int x = oldPoints.count();
                 int y = newPoints.count();

src/animations/splineanimation_p.h +1 -1

             public:
                 SplineAnimation(SplineChartItem *item);
                 ~SplineAnimation();
-                void setValues(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, QVector<QPointF> &oldContorlPoints, QVector<QPointF> &newControlPoints, int index);
+                void setup(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, QVector<QPointF> &oldContorlPoints, QVector<QPointF> &newControlPoints, int index = -1);
             protected:
                 QVariant interpolated(const QVariant &start, const QVariant &end, qreal progress) const;

src/animations/xyanimation.cpp +44 -37

@@ -39,50 +39,53 XYAnimation::~XYAnimation()
39	{	39	{
40	}	40	}
41		41
42	void XYAnimation::setAnimationType(Animation type)	42	void XYAnimation::setup(const QVector<QPointF> &oldPoints, const QVector<QPointF> &newPoints, int index)
43	{	43	{
44	if (state() != QAbstractAnimation::Stopped) stop();	44	m_type = NewAnimation;
45	m_type=type;
46	}
47		45
48	void XYAnimation::setValues(const QVector<QPointF> &oldPoints, const QVector<QPointF> &newPoints, int index)	46	if (state() != QAbstractAnimation::Stopped){
49	{	47	stop();
50	if (state() != QAbstractAnimation::Stopped) stop();	48	m_dirty=false;
		49	}
51		50
52	if (m_item->isDirty()) {	51	if(!m_dirty){
53	m_oldPoints = oldPoints;	52	m_dirty = true;
54	~~m_new~~Points = ~~new~~Points;	53	m_oldPoints = oldPoints;
55	m_dirty=false;	54	}
56	}
57	else {
58	if(m_dirty) {
59	m_newPoints = newPoints;
60	m_oldPoints = oldPoints;
61	m_dirty=false;
62	}
63	}
64		55
65	int x = m_oldPoints.count();	56	m_newPoints = newPoints;
66	int y = m_newPoints.count();
67		57
68	if (abs(x - y) == 1) {	58	int x = m_oldPoints.count();
69	if (y < x){	59	int y = m_newPoints.count();
70	if(!newPoints.isEmpty()) m_newPoints.insert(index,newPoints[index]);	60
71	m_index=index;if(newPoints.isEmpty())	61	if(x - y == 1 && index >= 0 && !newPoints.isEmpty()){
72	m_dirty=true;	62	//remove point
73	}	63	m_newPoints.insert(index, index >= 1 ? m_newPoints[index-1] : newPoints[index]);
74	if (y > x){	64	m_index=index;
75	m_oldPoints.insert(index, x > 0 ? m_oldPoints[index-1] : newPoints[index]);//add	65	m_type = RemovePointAnimation;
76	}	66	}
77	}else{	67
78	m_newPoints=newPoints;	68	if(x - y == -1 && index >= 0){
79	m_dirty=false;	69	//add point
80	m_oldPoints.resize(m_newPoints.size());	70	m_oldPoints.insert(index, x > 0 && index > 1 ? m_oldPoints[index-1] : newPoints[index]);
81	}	71	m_index=index;
		72	m_type = AddPointAnimation;
		73	}
		74
		75	x = m_oldPoints.count();
		76	y = m_newPoints.count();
		77
		78	if(x != y)
		79	{
		80	m_type = NewAnimation;
		81	}
		82	else if(m_type == NewAnimation)
		83	{
		84	m_type = ReplacePointAnimation;
		85	}
82		86
83	setKeyValueAt(0.0, qVariantFromValue(m_oldPoints));	87	setKeyValueAt(0.0, qVariantFromValue(m_oldPoints));
84	setKeyValueAt(1.0, qVariantFromValue(m_newPoints));	88	setKeyValueAt(1.0, qVariantFromValue(m_newPoints));
85
86	}	89	}
87		90
88	QVariant XYAnimation::interpolated(const QVariant &start, const QVariant &end, qreal progress ) const	91	QVariant XYAnimation::interpolated(const QVariant &start, const QVariant &end, qreal progress ) const
@@ -97,8 +100,9 QVariant XYAnimation::interpolated(const QVariant &start, const QVariant &end, q
97	case AddPointAnimation:	100	case AddPointAnimation:
98	case RemovePointAnimation:	101	case RemovePointAnimation:
99	{	102	{
100	if (startVector.count() != endVector.count())	103	if (startVector.count() != endVector.count()){
101	break;	104	break;
		105	}
102		106
103	for(int i = 0; i < startVector.count(); i++) {	107	for(int i = 0; i < startVector.count(); i++) {
104	qreal x = startVector[i].x() + ((endVector[i].x() - startVector[i].x()) * progress);	108	qreal x = startVector[i].x() + ((endVector[i].x() - startVector[i].x()) * progress);
@@ -124,10 +128,13 QVariant XYAnimation::interpolated(const QVariant &start, const QVariant &end, q
124	void XYAnimation::updateCurrentValue (const QVariant &value)	128	void XYAnimation::updateCurrentValue (const QVariant &value)
125	{	129	{
126	if(state()!=QAbstractAnimation::Stopped){ //workaround	130	if(state()!=QAbstractAnimation::Stopped){ //workaround
		131
127	QVector<QPointF> vector = qVariantValue<QVector<QPointF> >(value);	132	QVector<QPointF> vector = qVariantValue<QVector<QPointF> >(value);
128	m_item->setGeometryPoints(vector);	133	m_item->setGeometryPoints(vector);
129	m_item->updateGeometry();	134	m_item->updateGeometry();
130	m_item->setDirty(true);	135	m_item->setDirty(true);
		136	m_dirty=false;
		137
131	}	138	}
132	}	139	}
133		140

src/animations/xyanimation_p.h +1 -2

                 enum Animation { AddPointAnimation, RemovePointAnimation, ReplacePointAnimation, NewAnimation };
                 XYAnimation(XYChart *item);
                 ~XYAnimation();
-                void setValues(const QVector<QPointF> &oldPoints, const QVector<QPointF> &newPoints,int index);
+                void setup(const QVector<QPointF> &oldPoints, const QVector<QPointF> &newPoints,int index = -1);
-                void setAnimationType(Animation type);
                 Animation animationType() const { return m_type; };
             protected:

src/splinechart/splinechartitem.cpp +5 -1

                 }
                 if (m_animation) {
-                    m_animation->setValues(oldPoints,newPoints,m_controlPoints,controlPoints,index);
+                    m_animation->setup(oldPoints,newPoints,m_controlPoints,controlPoints,index);
+                    setGeometryPoints(newPoints);
+                    setDirty(false);
                     presenter()->startAnimation(m_animation);
                 }
                 else {
                 const QVector<QPointF> &controlPoints = controlGeometryPoints();
                 if ((points.size()<2) || (controlPoints.size()<2)) {
+                	prepareGeometryChange();
                     m_path = QPainterPath();
+                    m_rect = QRect();
                     return;
                 }

src/xychart/xychart.cpp +2 -21

             void XYChart::updateChart(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints,int index)
             {
                 if (m_animation) {
-                    m_animation->setValues(oldPoints, newPoints, index);
+                    m_animation->setup(oldPoints, newPoints, index);
                     setGeometryPoints(newPoints);
                     setDirty(false);
                     presenter()->startAnimation(m_animation);
                 QVector<QPointF> points;
-            	if(m_animation) {
-            		m_animation->setAnimationType(XYAnimation::AddPointAnimation);
             	if(m_dirty) {
             		points = calculateGeometryPoints();
             	} else {
             	QVector<QPointF> points;
-            	if(m_animation) {
-            		m_animation->setAnimationType(XYAnimation::RemovePointAnimation);
             	if(m_dirty) {
             		points = calculateGeometryPoints();
             	} else {
             	QVector<QPointF> points;
-            	if(m_animation) {
-            		m_animation->setAnimationType(XYAnimation::ReplacePointAnimation);
             	if(m_dirty) {
             		points = calculateGeometryPoints();
             	} else {
                 QVector<QPointF> points = calculateGeometryPoints();
-                if(m_animation) {
-                    m_animation->setAnimationType(XYAnimation::ReplacePointAnimation);
                 updateChart(m_points,points);
             }
                 QVector<QPointF> points = calculateGeometryPoints();
-                if(m_animation) {
-                      m_animation->setAnimationType(XYAnimation::NewAnimation);
                 updateChart(m_points,points);
             }

src/xychart/xychart_p.h +1 -1

                 void clicked(const QPointF& point);
             protected:
-                virtual void updateChart(QVector<QPointF> &oldPoints,QVector<QPointF> &newPoints,int index = 0);
+                virtual void updateChart(QVector<QPointF> &oldPoints,QVector<QPointF> &newPoints,int index = -1);
                 QPointF calculateGeometryPoint(const QPointF &point) const;
                 QPointF calculateGeometryPoint(int index) const;
                 QPointF calculateDomainPoint(const QPointF &point) const;

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