HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/animations/splineanimation.cpp

adds QLineAnimation fixes

Michal Klocek - - Load All Authors

File last commit:

r1271:b11722f80588


                r1271:b11722f80588

Download file

             splineanimation.cpp
        
                    153 lines
            
             | 5.6 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / animations / splineanimation.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Jani Honkonen
    
Add license headers

              r794
            
      /****************************************************************************

      **

      ** Copyright (C) 2012 Digia Plc

      ** All rights reserved.

      ** For any questions to Digia, please use contact form at http://qt.digia.com

      **

      ** This file is part of the Qt Commercial Charts Add-on.

      **

      ** $QT_BEGIN_LICENSE$

      ** Licensees holding valid Qt Commercial licenses may use this file in

      ** accordance with the Qt Commercial License Agreement provided with the

      ** Software or, alternatively, in accordance with the terms contained in

      ** a written agreement between you and Digia.

      **

      ** If you have questions regarding the use of this file, please use

      ** contact form at http://qt.digia.com

      ** $QT_END_LICENSE$

      **

      ****************************************************************************/

        Michal Klocek
    
Improves spline interpolation...

              r622
            
      #include "splineanimation_p.h"

      #include "splinechartitem_p.h"

        Michal Klocek
    
Improves build configuration...

              r996
            
      #include <QDebug>

        Michal Klocek
    
Improves spline interpolation...

              r622
            
      Q_DECLARE_METATYPE(QVector<QPointF>)

      Q_DECLARE_METATYPE(SplineVector)

      QTCOMMERCIALCHART_BEGIN_NAMESPACE

        Michal Klocek
    
Refactors animation handling for xyseries

              r1217
            
      SplineAnimation::SplineAnimation(SplineChartItem* item):XYAnimation(item),

        Marek Rosa
    
Animation folder formating: white spaces, brackets, etc fixed

              r738
            
          m_item(item),

          m_dirty(true)

        Michal Klocek
    
Improves spline interpolation...

              r622
            
      {

      }

      SplineAnimation::~SplineAnimation()

      {

      }

        Michal Klocek
    
adds QLineAnimation fixes

              r1271
            
      void SplineAnimation::setup(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, QVector<QPointF> &oldControlPoints, QVector<QPointF> &newControlPoints, int index)

        Michal Klocek
    
Improves spline interpolation...

              r622
            
      {

          int x = oldPoints.count();

          int y = newPoints.count();

        Marek Rosa
    
Animation folder formating: white spaces, brackets, etc fixed

              r738
            
          Q_ASSERT(newPoints.count() * 2 - 2 == newControlPoints.count());

        Michal Klocek
    
Improves spline interpolation...

              r622
            
        Marek Rosa
    
Animation folder formating: white spaces, brackets, etc fixed

              r738
            
          if (x != y && abs(x - y) != 1) {

              m_oldSpline.first = newPoints;

              m_oldSpline.second = newControlPoints;

        Michal Klocek
    
Improves spline interpolation...

              r622
            
              oldPoints.resize(newPoints.size());

              oldControlPoints.resize(newControlPoints.size());

              SplineVector oldPair;

        Marek Rosa
    
Animation folder formating: white spaces, brackets, etc fixed

              r738
            
              oldPair.first = oldPoints;

              oldPair.second = oldControlPoints;

        Michal Klocek
    
Improves spline interpolation...

              r622
            
              SplineVector newPair;

        Marek Rosa
    
Animation folder formating: white spaces, brackets, etc fixed

              r738
            
              newPair.first = newPoints;

              newPair.second = newControlPoints;

        Michal Klocek
    
Improves spline interpolation...

              r622
            
              setKeyValueAt(0.0, qVariantFromValue(oldPair));

              setKeyValueAt(1.0, qVariantFromValue(newPair));

        Marek Rosa
    
Animation folder formating: white spaces, brackets, etc fixed

              r738
            
              m_dirty = false;

        Michal Klocek
    
Improves spline interpolation...

              r622
            
          }

          else {

              if(m_dirty) {

                  m_oldSpline.first = oldPoints;

                  m_oldSpline.second = oldControlPoints;

        Marek Rosa
    
Animation folder formating: white spaces, brackets, etc fixed

              r738
            
                  m_dirty = false;

        Michal Klocek
    
Improves spline interpolation...

              r622
            
              }

              oldPoints = newPoints;

              oldControlPoints = newControlPoints;

        Marek Rosa
    
Animation folder formating: white spaces, brackets, etc fixed

              r738
            
              if (y < x) {

        Michal Klocek
    
Improves spline interpolation...

              r622
            
                  m_oldSpline.first.remove(index); //remove

        Marek Rosa
    
Animation folder formating: white spaces, brackets, etc fixed

              r738
            
                  m_oldSpline.second.remove(index * 2);

                  m_oldSpline.second.remove(index * 2);

        Michal Klocek
    
Improves spline interpolation...

              r622
            
              }

        Marek Rosa
    
Animation folder formating: white spaces, brackets, etc fixed

              r738
            
              if (y > x) {

                  m_oldSpline.first.insert(index, x > 0 ? m_oldSpline.first[index-1] : newPoints[index]); //add

                  m_oldSpline.second.insert((index - 1) * 2, x > 1 ? m_oldSpline.second[(index-2)*2] : newControlPoints[(index - 1) * 2]); //add

                  m_oldSpline.second.insert((index - 1) * 2 + 1, x > 1 ? m_oldSpline.second[(index - 2) * 2 + 1] : newControlPoints[(index - 1) * 2 + 1]); //add

        Michal Klocek
    
Improves spline interpolation...

              r622
            
              }

              SplineVector newPair;

              newPair.first=newPoints;

              newPair.second=newControlPoints;

              setKeyValueAt(0.0, qVariantFromValue(m_oldSpline));

              setKeyValueAt(1.0, qVariantFromValue(newPair));

          }

      }

        Marek Rosa
    
Animation folder formating: white spaces, brackets, etc fixed

              r738
            
      QVariant SplineAnimation::interpolated(const QVariant &start, const QVariant &end, qreal progress ) const

        Michal Klocek
    
Improves spline interpolation...

              r622
            
      {

          SplineVector startPair  =  qVariantValue< SplineVector >(start);

          SplineVector endPair =  qVariantValue< SplineVector >(end);

          SplineVector result;

        Michal Klocek
    
Refactors animation handling for xyseries

              r1217
            
          switch (animationType()) {

        Michal Klocek
    
Improves spline interpolation...

              r622
            
        Michal Klocek
    
Refactors axis animation, line animations

              r1241
            
          case RemovePointAnimation:

          case AddPointAnimation:

          case ReplacePointAnimation:

          {

        Marek Rosa
    
Animation folder formating: white spaces, brackets, etc fixed

              r738
            
              if (startPair.first.count() != endPair.first.count())

        Michal Klocek
    
Improves spline interpolation...

              r622
            
                  break;

        Marek Rosa
    
Animation folder formating: white spaces, brackets, etc fixed

              r738
            
              Q_ASSERT(startPair.first.count() * 2 - 2 == startPair.second.count());

              Q_ASSERT(endPair.first.count() * 2 - 2 == endPair.second.count());

              for(int i = 0; i < endPair.first.count(); i++) {

                  qreal x = startPair.first[i].x() + ((endPair.first[i].x() - startPair.first[i].x()) * progress);

                  qreal y = startPair.first[i].y() + ((endPair.first[i].y() - startPair.first[i].y()) * progress);

                  result.first << QPointF(x,y);

                  if (i + 1 >= endPair.first.count())

                      continue;

                  x = startPair.second[i * 2].x() + ((endPair.second[i * 2].x() - startPair.second[i * 2].x()) * progress);

                  y = startPair.second[i * 2].y() + ((endPair.second[i * 2].y() - startPair.second[i * 2].y()) * progress);

                  result.second << QPoint(x,y);

                  x = startPair.second[i * 2 + 1].x() + ((endPair.second[i * 2 + 1].x() - startPair.second[i * 2 + 1].x()) * progress);

                  y = startPair.second[i * 2 + 1].y() + ((endPair.second[i * 2 + 1].y() - startPair.second[i * 2 + 1].y()) * progress);

                  result.second << QPoint(x,y);

        Michal Klocek
    
Improves spline interpolation...

              r622
            
              }

        Marek Rosa
    
Animation folder formating: white spaces, brackets, etc fixed

              r738
            
          }

              break;

        Michal Klocek
    
Refactors axis animation, line animations

              r1241
            
          case NewAnimation:{

        Marek Rosa
    
Animation folder formating: white spaces, brackets, etc fixed

              r738
            
              Q_ASSERT(endPair.first.count() * 2 - 2 == endPair.second.count());

        Michal Klocek
    
Krazy reported errors...

              r974
            
              int count = endPair.first.count()* qBound(qreal(0), progress, qreal(1));

        Marek Rosa
    
Animation folder formating: white spaces, brackets, etc fixed

              r738
            
              for(int i = 0; i < count; i++) {

                  result.first << endPair.first[i];

                  if(i + 1 == count)

                      break;

                  result.second << endPair.second[2 * i];

                  result.second << endPair.second[2 * i + 1];

              }

          }

              break;

          default:

        Michal Klocek
    
Refactors animation handling for xyseries

              r1217
            
              qWarning() << "Unknown type of animation";

        Marek Rosa
    
Animation folder formating: white spaces, brackets, etc fixed

              r738
            
              break;

        Michal Klocek
    
Improves spline interpolation...

              r622
            
          }

          return qVariantFromValue(result);

      }

        Marek Rosa
    
Animation folder formating: white spaces, brackets, etc fixed

              r738
            
      void SplineAnimation::updateCurrentValue (const QVariant &value )

        Michal Klocek
    
Improves spline interpolation...

              r622
            
      {

        Marek Rosa
    
Animation folder formating: white spaces, brackets, etc fixed

              r738
            
          if (state() != QAbstractAnimation::Stopped) { //workaround

              m_dirty = true;

        Michal Klocek
    
Improves spline interpolation...

              r622
            
              QPair<QVector<QPointF >, QVector<QPointF > > pair = qVariantValue< QPair< QVector<QPointF>, QVector<QPointF> > >(value);

        Michal Klocek
    
Refactors animation handling for xyseries

              r1217
            
              m_item->setGeometryPoints(pair.first);

              m_item->setControlGeometryPoints(pair.second);

              m_item->updateGeometry();

        Michal Klocek
    
Improves spline interpolation...

              r622
            
          }

      }

      QTCOMMERCIALCHART_END_NAMESPACE

	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

Jani Honkonen Add license headers	r794	/****************************************************************************
		**
		** Copyright (C) 2012 Digia Plc
		** All rights reserved.
		** For any questions to Digia, please use contact form at http://qt.digia.com
		**
		** This file is part of the Qt Commercial Charts Add-on.
		**
		** $QT_BEGIN_LICENSE$
		** Licensees holding valid Qt Commercial licenses may use this file in
		** accordance with the Qt Commercial License Agreement provided with the
		** Software or, alternatively, in accordance with the terms contained in
		** a written agreement between you and Digia.
		**
		** If you have questions regarding the use of this file, please use
		** contact form at http://qt.digia.com
		** $QT_END_LICENSE$
		**
		****************************************************************************/

Michal Klocek Improves spline interpolation...	r622	#include "splineanimation_p.h"
		#include "splinechartitem_p.h"
Michal Klocek Improves build configuration...	r996	#include <QDebug>
Michal Klocek Improves spline interpolation...	r622
		Q_DECLARE_METATYPE(QVector<QPointF>)
		Q_DECLARE_METATYPE(SplineVector)

		QTCOMMERCIALCHART_BEGIN_NAMESPACE

Michal Klocek Refactors animation handling for xyseries	r1217	SplineAnimation::SplineAnimation(SplineChartItem* item):XYAnimation(item),
Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738	m_item(item),
		m_dirty(true)
Michal Klocek Improves spline interpolation...	r622	{
		}

		SplineAnimation::~SplineAnimation()
		{
		}

Michal Klocek adds QLineAnimation fixes	r1271	void SplineAnimation::setup(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, QVector<QPointF> &oldControlPoints, QVector<QPointF> &newControlPoints, int index)
Michal Klocek Improves spline interpolation...	r622	{
		int x = oldPoints.count();
		int y = newPoints.count();

Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738	Q_ASSERT(newPoints.count() * 2 - 2 == newControlPoints.count());
Michal Klocek Improves spline interpolation...	r622
Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738	if (x != y && abs(x - y) != 1) {
		m_oldSpline.first = newPoints;
		m_oldSpline.second = newControlPoints;
Michal Klocek Improves spline interpolation...	r622	oldPoints.resize(newPoints.size());
		oldControlPoints.resize(newControlPoints.size());
		SplineVector oldPair;
Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738	oldPair.first = oldPoints;
		oldPair.second = oldControlPoints;
Michal Klocek Improves spline interpolation...	r622	SplineVector newPair;
Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738	newPair.first = newPoints;
		newPair.second = newControlPoints;
Michal Klocek Improves spline interpolation...	r622	setKeyValueAt(0.0, qVariantFromValue(oldPair));
		setKeyValueAt(1.0, qVariantFromValue(newPair));
Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738	m_dirty = false;
Michal Klocek Improves spline interpolation...	r622	}
		else {
		if(m_dirty) {
		m_oldSpline.first = oldPoints;
		m_oldSpline.second = oldControlPoints;
Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738	m_dirty = false;
Michal Klocek Improves spline interpolation...	r622	}
		oldPoints = newPoints;
		oldControlPoints = newControlPoints;
Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738	if (y < x) {
Michal Klocek Improves spline interpolation...	r622	m_oldSpline.first.remove(index); //remove
Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738	m_oldSpline.second.remove(index * 2);
		m_oldSpline.second.remove(index * 2);
Michal Klocek Improves spline interpolation...	r622	}
Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738	if (y > x) {
		m_oldSpline.first.insert(index, x > 0 ? m_oldSpline.first[index-1] : newPoints[index]); //add
		m_oldSpline.second.insert((index - 1) * 2, x > 1 ? m_oldSpline.second[(index-2)2] : newControlPoints[(index - 1) 2]); //add
		m_oldSpline.second.insert((index - 1) * 2 + 1, x > 1 ? m_oldSpline.second[(index - 2) * 2 + 1] : newControlPoints[(index - 1) * 2 + 1]); //add
Michal Klocek Improves spline interpolation...	r622	}
		SplineVector newPair;
		newPair.first=newPoints;
		newPair.second=newControlPoints;
		setKeyValueAt(0.0, qVariantFromValue(m_oldSpline));
		setKeyValueAt(1.0, qVariantFromValue(newPair));
		}
		}

Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738	QVariant SplineAnimation::interpolated(const QVariant &start, const QVariant &end, qreal progress ) const
Michal Klocek Improves spline interpolation...	r622	{

		SplineVector startPair = qVariantValue< SplineVector >(start);
		SplineVector endPair = qVariantValue< SplineVector >(end);
		SplineVector result;

Michal Klocek Refactors animation handling for xyseries	r1217	switch (animationType()) {
Michal Klocek Improves spline interpolation...	r622
Michal Klocek Refactors axis animation, line animations	r1241	case RemovePointAnimation:
		case AddPointAnimation:
		case ReplacePointAnimation:
		{
Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738	if (startPair.first.count() != endPair.first.count())
Michal Klocek Improves spline interpolation...	r622	break;
Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738	Q_ASSERT(startPair.first.count() * 2 - 2 == startPair.second.count());
		Q_ASSERT(endPair.first.count() * 2 - 2 == endPair.second.count());
		for(int i = 0; i < endPair.first.count(); i++) {
		qreal x = startPair.first[i].x() + ((endPair.first[i].x() - startPair.first[i].x()) * progress);
		qreal y = startPair.first[i].y() + ((endPair.first[i].y() - startPair.first[i].y()) * progress);
		result.first << QPointF(x,y);
		if (i + 1 >= endPair.first.count())
		continue;
		x = startPair.second[i * 2].x() + ((endPair.second[i * 2].x() - startPair.second[i * 2].x()) * progress);
		y = startPair.second[i * 2].y() + ((endPair.second[i * 2].y() - startPair.second[i * 2].y()) * progress);
		result.second << QPoint(x,y);
		x = startPair.second[i * 2 + 1].x() + ((endPair.second[i * 2 + 1].x() - startPair.second[i * 2 + 1].x()) * progress);
		y = startPair.second[i * 2 + 1].y() + ((endPair.second[i * 2 + 1].y() - startPair.second[i * 2 + 1].y()) * progress);
		result.second << QPoint(x,y);
Michal Klocek Improves spline interpolation...	r622	}
Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738
		}
		break;
Michal Klocek Refactors axis animation, line animations	r1241	case NewAnimation:{
Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738	Q_ASSERT(endPair.first.count() * 2 - 2 == endPair.second.count());
Michal Klocek Krazy reported errors...	r974	int count = endPair.first.count()* qBound(qreal(0), progress, qreal(1));
Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738	for(int i = 0; i < count; i++) {
		result.first << endPair.first[i];
		if(i + 1 == count)
		break;
		result.second << endPair.second[2 * i];
		result.second << endPair.second[2 * i + 1];
		}
		}
		break;
		default:
Michal Klocek Refactors animation handling for xyseries	r1217	qWarning() << "Unknown type of animation";
Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738	break;
Michal Klocek Improves spline interpolation...	r622	}

		return qVariantFromValue(result);
		}

Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738	void SplineAnimation::updateCurrentValue (const QVariant &value )
Michal Klocek Improves spline interpolation...	r622	{
Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738	if (state() != QAbstractAnimation::Stopped) { //workaround
		m_dirty = true;
Michal Klocek Improves spline interpolation...	r622	QPair<QVector<QPointF >, QVector<QPointF > > pair = qVariantValue< QPair< QVector<QPointF>, QVector<QPointF> > >(value);
Michal Klocek Refactors animation handling for xyseries	r1217	m_item->setGeometryPoints(pair.first);
		m_item->setControlGeometryPoints(pair.second);
		m_item->updateGeometry();
Michal Klocek Improves spline interpolation...	r622	}
		}


		QTCOMMERCIALCHART_END_NAMESPACE