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

Adds AxisY(series) getter

Jani Honkonen - - Load All Authors

File last commit:

r794:4c76de65bbac


                r899:46c4ead56465

Download file

             xyanimation.cpp
        
                    109 lines
            
             | 3.2 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / animations / xyanimation.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
    
Animation refactor...

              r530
            
      #include "xyanimation_p.h"

      #include "xychartitem_p.h"

      Q_DECLARE_METATYPE(QVector<QPointF>)

      QTCOMMERCIALCHART_BEGIN_NAMESPACE

      XYAnimation::XYAnimation(XYChartItem *item):ChartAnimation(item),

          m_item(item),

          m_dirty(false)

      {

      }

      XYAnimation::~XYAnimation()

      {

      }

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

              r738
            
      void XYAnimation::setValues(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, int index)

        Michal Klocek
    
Animation refactor...

              r530
            
      {

        Michal Klocek
    
Improves spline interpolation...

              r622
            
          int x = oldPoints.count();

          int y = newPoints.count();

        Michal Klocek
    
Animation refactor...

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

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

        Michal Klocek
    
Improves spline interpolation...

              r622
            
              m_oldPoints = newPoints;

              oldPoints.resize(newPoints.size());

              setKeyValueAt(0.0, qVariantFromValue(oldPoints));

              setKeyValueAt(1.0, qVariantFromValue(newPoints));

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

              r738
            
              m_dirty = false;

        Michal Klocek
    
Animation refactor...

              r530
            
          }

        Michal Klocek
    
Improves spline interpolation...

              r622
            
          else {

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

              r738
            
              if (m_dirty) {

        Michal Klocek
    
Improves spline interpolation...

              r622
            
                  m_oldPoints = oldPoints;

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

              r738
            
                  m_dirty = false;

        Michal Klocek
    
Improves spline interpolation...

              r622
            
              }

              oldPoints = newPoints;

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

              r738
            
              if (y < x)

                  m_oldPoints.remove(index); //remove

              if (y > x)

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

        Michal Klocek
    
Improves spline interpolation...

              r622
            
              setKeyValueAt(0.0, qVariantFromValue(m_oldPoints));

              setKeyValueAt(1.0, qVariantFromValue(newPoints));

              Q_ASSERT(m_oldPoints.count() == newPoints.count());

          }

        Michal Klocek
    
Animation refactor...

              r530
            
      }

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

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

        Michal Klocek
    
Animation refactor...

              r530
            
      {

          QVector<QPointF> startVector = qVariantValue<QVector<QPointF> >(start);

          QVector<QPointF> endVector = qVariantValue<QVector<QPointF> >(end);

          QVector<QPointF> result;

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

              r738
            
          switch (m_type) {

        Michal Klocek
    
Bugfix wrong index when points added to xychart

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

              r738
            
          case MoveDownAnimation: {

        Michal Klocek
    
Animation refactor...

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

              r738
            
              if (startVector.count() != endVector.count())

        Michal Klocek
    
Animation refactor...

              r530
            
                  break;

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

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

                  qreal x = startVector[i].x() + ((endVector[i].x() - startVector[i].x()) * progress);

                  qreal y = startVector[i].y() + ((endVector[i].y() - startVector[i].y()) * progress);

                  result << QPointF(x, y);

        Michal Klocek
    
Animation refactor...

              r530
            
              }

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

              r738
            
          }

              break;

          case LineDrawAnimation: {

              for(int i = 0; i < endVector.count() * qBound(0.0, progress, 1.0); i++)

                  result << endVector[i];

          }

              break;

          default:

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

              break;

        Michal Klocek
    
Animation refactor...

              r530
            
          }

          return qVariantFromValue(result);

      }

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

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

        Michal Klocek
    
Animation refactor...

              r530
            
      {

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

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

              r738
            
              m_dirty = true;

        Michal Klocek
    
Animation refactor...

              r530
            
              QVector<QPointF> vector = qVariantValue<QVector<QPointF> >(value);

        Michal Klocek
    
Unify naming setGeometry -> setLayout

              r557
            
              m_item->setLayout(vector);

        Michal Klocek
    
Animation refactor...

              r530
            
          }

      }

      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 Animation refactor...	r530	#include "xyanimation_p.h"
		#include "xychartitem_p.h"

		Q_DECLARE_METATYPE(QVector<QPointF>)

		QTCOMMERCIALCHART_BEGIN_NAMESPACE

		XYAnimation::XYAnimation(XYChartItem *item):ChartAnimation(item),
		m_item(item),
		m_dirty(false)
		{
		}

		XYAnimation::~XYAnimation()
		{
		}

Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738	void XYAnimation::setValues(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, int index)
Michal Klocek Animation refactor...	r530	{
Michal Klocek Improves spline interpolation...	r622	int x = oldPoints.count();
		int y = newPoints.count();
Michal Klocek Animation refactor...	r530
Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738	if (x != y && abs(x - y) != 1) {
Michal Klocek Improves spline interpolation...	r622	m_oldPoints = newPoints;
		oldPoints.resize(newPoints.size());
		setKeyValueAt(0.0, qVariantFromValue(oldPoints));
		setKeyValueAt(1.0, qVariantFromValue(newPoints));
Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738	m_dirty = false;
Michal Klocek Animation refactor...	r530	}
Michal Klocek Improves spline interpolation...	r622	else {
Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738	if (m_dirty) {
Michal Klocek Improves spline interpolation...	r622	m_oldPoints = oldPoints;
Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738	m_dirty = false;
Michal Klocek Improves spline interpolation...	r622	}
		oldPoints = newPoints;
Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738	if (y < x)
		m_oldPoints.remove(index); //remove
		if (y > x)
		m_oldPoints.insert(index, x > 0 ? m_oldPoints[index-1] : newPoints[index]); //add
Michal Klocek Improves spline interpolation...	r622	setKeyValueAt(0.0, qVariantFromValue(m_oldPoints));
		setKeyValueAt(1.0, qVariantFromValue(newPoints));
		Q_ASSERT(m_oldPoints.count() == newPoints.count());
		}
Michal Klocek Animation refactor...	r530	}

Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738	QVariant XYAnimation::interpolated(const QVariant &start, const QVariant &end, qreal progress ) const
Michal Klocek Animation refactor...	r530	{
		QVector<QPointF> startVector = qVariantValue<QVector<QPointF> >(start);
		QVector<QPointF> endVector = qVariantValue<QVector<QPointF> >(end);
		QVector<QPointF> result;

Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738	switch (m_type) {
Michal Klocek Bugfix wrong index when points added to xychart	r602
Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738	case MoveDownAnimation: {
Michal Klocek Animation refactor...	r530
Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738	if (startVector.count() != endVector.count())
Michal Klocek Animation refactor...	r530	break;
Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738
		for(int i = 0; i < startVector.count(); i++) {
		qreal x = startVector[i].x() + ((endVector[i].x() - startVector[i].x()) * progress);
		qreal y = startVector[i].y() + ((endVector[i].y() - startVector[i].y()) * progress);
		result << QPointF(x, y);
Michal Klocek Animation refactor...	r530	}
Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738
		}
		break;
		case LineDrawAnimation: {
		for(int i = 0; i < endVector.count() * qBound(0.0, progress, 1.0); i++)
		result << endVector[i];
		}
		break;
		default:
		qWarning() << "Unknown type of animation";
		break;
Michal Klocek Animation refactor...	r530	}

		return qVariantFromValue(result);
		}

Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738	void XYAnimation::updateCurrentValue (const QVariant &value)
Michal Klocek Animation refactor...	r530	{
		if(state()!=QAbstractAnimation::Stopped){ //workaround
Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738	m_dirty = true;
Michal Klocek Animation refactor...	r530	QVector<QPointF> vector = qVariantValue<QVector<QPointF> >(value);
Michal Klocek Unify naming setGeometry -> setLayout	r557	m_item->setLayout(vector);
Michal Klocek Animation refactor...	r530	}
		}

		QTCOMMERCIALCHART_END_NAMESPACE