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

QML chart properties tester to match the current QML api

Michal Klocek - - Load All Authors

File last commit:

r1965:8d7d66e44a18


                r2096:4834084a6f1a

Download file

             axisanimation.cpp
        
                    139 lines
            
             | 4.4 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / animations / axisanimation.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 "axisanimation_p.h"

        Michal Klocek
    
Refactors axis animation, line animations

              r1241
            
      #include "chartaxis_p.h"

        Michal Klocek
    
Refactors layout...

              r1965
            
      #include "chartpresenter_p.h"

        Michal Klocek
    
Animation refactor...

              r530
            
      #include <QTimer>

        Michal Klocek
    
Refactors axis animation, line animations

              r1241
            
      #include <QDebug>

        Michal Klocek
    
Animation refactor...

              r530
            
      Q_DECLARE_METATYPE(QVector<qreal>)

      QTCOMMERCIALCHART_BEGIN_NAMESPACE

        Michal Klocek
    
Changes QChartAxis -> QAxis

              r1006
            
      AxisAnimation::AxisAnimation(ChartAxis *axis): ChartAnimation(axis),

        Michal Klocek
    
Refactors axis animation, line animations

              r1241
            
          m_axis(axis),

          m_type(DefaultAnimation)

        Michal Klocek
    
Animation refactor...

              r530
            
      {

        Michal Klocek
    
Refactors axis animation, line animations

              r1241
            
          setDuration(ChartAnimationDuration);

          setEasingCurve(QEasingCurve::OutQuart);

        Michal Klocek
    
Animation refactor...

              r530
            
      }

      AxisAnimation::~AxisAnimation()

      {

      }

        Michal Klocek
    
Refactors axis animation, line animations

              r1241
            
      void AxisAnimation::setAnimationType(Animation type)

      {

          if (state() != QAbstractAnimation::Stopped) stop();

          m_type=type;

      }

      void AxisAnimation::setAnimationPoint(const QPointF& point)

      {

          if (state() != QAbstractAnimation::Stopped) stop();

          m_point=point;

      }

      void AxisAnimation::setValues(QVector<qreal> &oldLayout, QVector<qreal> &newLayout)

      {

            if (state() != QAbstractAnimation::Stopped) stop();

            if (newLayout.count() == 0)

                return;

            switch (m_type) {

            case ZoomOutAnimation: {

        Michal Klocek
    
Refactors layout...

              r1965
            
                QRectF rect = m_axis->presenter()->chartsGeometry();

        Michal Klocek
    
Refactors axis animation, line animations

              r1241
            
                oldLayout.resize(newLayout.count());

                for(int i = 0, j = oldLayout.count() - 1; i < (oldLayout.count() + 1) / 2; ++i, --j) {

                    oldLayout[i] = m_axis->axisType() == ChartAxis::X_AXIS ? rect.left() : rect.bottom();

                    oldLayout[j] = m_axis->axisType() == ChartAxis::X_AXIS ? rect.right() : rect.top();

                }

            }

                break;

            case ZoomInAnimation: {

        Marek Rosa
    
Added casting to qreal in qMin, qFuzzyCompare calls to fix build on arm

              r1679
            
                int index = qMin(oldLayout.count() * (m_axis->axisType() == ChartAxis::X_AXIS ? m_point.x() : (1 - m_point.y())), newLayout.count() - (qreal)1.0);

        Michal Klocek
    
Refactors axis animation, line animations

              r1241
            
                oldLayout.resize(newLayout.count());

                for(int i = 0; i < oldLayout.count(); i++)

                    oldLayout[i]= oldLayout[index];

            }

                break;

            case MoveForwardAnimation: {

                oldLayout.resize(newLayout.count());

                for(int i = 0, j = i + 1; i < oldLayout.count() - 1; ++i, ++j)

                    oldLayout[i]= oldLayout[j];

            }

                break;

            case MoveBackwordAnimation: {

                oldLayout.resize(newLayout.count());

                for(int i = oldLayout.count() - 1, j = i - 1; i > 0; --i, --j)

                    oldLayout[i]= oldLayout[j];

            }

                break;

            default: {

                oldLayout.resize(newLayout.count());

        Michal Klocek
    
Refactors layout...

              r1965
            
                QRectF rect = m_axis->presenter()->chartsGeometry();

        Michal Klocek
    
Refactors axis animation, line animations

              r1241
            
                for(int i = 0, j = oldLayout.count() - 1; i < oldLayout.count(); ++i, --j)

                    oldLayout[i] = m_axis->axisType() == ChartAxis::X_AXIS ? rect.left() : rect.top();

            }

                break;

            }

            QVariantAnimation::KeyValues value;

            setKeyValues(value); //workaround for wrong interpolation call

            setKeyValueAt(0.0, qVariantFromValue(oldLayout));

            setKeyValueAt(1.0, qVariantFromValue(newLayout));

      }

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

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

        Michal Klocek
    
Animation refactor...

              r530
            
      {

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

          QVector<qreal> endVecotr = qVariantValue<QVector<qreal> >(end);

          QVector<qreal> result;

          Q_ASSERT(startVector.count() == endVecotr.count()) ;

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

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

        Michal Klocek
    
Animation refactor...

              r530
            
                 qreal value = startVector[i] + ((endVecotr[i]- startVector[i]) * progress);//qBound(0.0, progress, 1.0));

                 result << value;

          }

          return qVariantFromValue(result);

      }

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

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

        Michal Klocek
    
Animation refactor...

              r530
            
      {

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

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

        Michal Klocek
    
Animation refactor...

              r530
            
          {

              QVector<qreal> vector = qVariantValue<QVector<qreal> >(value);

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

              r738
            
              Q_ASSERT(vector.count() != 0);

        Michal Klocek
    
Animation refactor...

              r530
            
              m_axis->setLayout(vector);

        Michal Klocek
    
Refactors axis animation, line animations

              r1241
            
              m_axis->updateGeometry();

        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 "axisanimation_p.h"
Michal Klocek Refactors axis animation, line animations	r1241	#include "chartaxis_p.h"
Michal Klocek Refactors layout...	r1965	#include "chartpresenter_p.h"
Michal Klocek Animation refactor...	r530	#include <QTimer>
Michal Klocek Refactors axis animation, line animations	r1241	#include <QDebug>
Michal Klocek Animation refactor...	r530
		Q_DECLARE_METATYPE(QVector<qreal>)

		QTCOMMERCIALCHART_BEGIN_NAMESPACE


Michal Klocek Changes QChartAxis -> QAxis	r1006	AxisAnimation::AxisAnimation(ChartAxis *axis): ChartAnimation(axis),
Michal Klocek Refactors axis animation, line animations	r1241	m_axis(axis),
		m_type(DefaultAnimation)
Michal Klocek Animation refactor...	r530	{
Michal Klocek Refactors axis animation, line animations	r1241	setDuration(ChartAnimationDuration);
		setEasingCurve(QEasingCurve::OutQuart);
Michal Klocek Animation refactor...	r530	}

		AxisAnimation::~AxisAnimation()
		{
		}

Michal Klocek Refactors axis animation, line animations	r1241	void AxisAnimation::setAnimationType(Animation type)
		{
		if (state() != QAbstractAnimation::Stopped) stop();
		m_type=type;
		}

		void AxisAnimation::setAnimationPoint(const QPointF& point)
		{
		if (state() != QAbstractAnimation::Stopped) stop();
		m_point=point;
		}

		void AxisAnimation::setValues(QVector<qreal> &oldLayout, QVector<qreal> &newLayout)
		{
		if (state() != QAbstractAnimation::Stopped) stop();

		if (newLayout.count() == 0)
		return;

		switch (m_type) {
		case ZoomOutAnimation: {
Michal Klocek Refactors layout...	r1965	QRectF rect = m_axis->presenter()->chartsGeometry();
Michal Klocek Refactors axis animation, line animations	r1241	oldLayout.resize(newLayout.count());

		for(int i = 0, j = oldLayout.count() - 1; i < (oldLayout.count() + 1) / 2; ++i, --j) {
		oldLayout[i] = m_axis->axisType() == ChartAxis::X_AXIS ? rect.left() : rect.bottom();
		oldLayout[j] = m_axis->axisType() == ChartAxis::X_AXIS ? rect.right() : rect.top();
		}
		}
		break;
		case ZoomInAnimation: {
Marek Rosa Added casting to qreal in qMin, qFuzzyCompare calls to fix build on arm	r1679	int index = qMin(oldLayout.count() * (m_axis->axisType() == ChartAxis::X_AXIS ? m_point.x() : (1 - m_point.y())), newLayout.count() - (qreal)1.0);
Michal Klocek Refactors axis animation, line animations	r1241	oldLayout.resize(newLayout.count());

		for(int i = 0; i < oldLayout.count(); i++)
		oldLayout[i]= oldLayout[index];
		}
		break;
		case MoveForwardAnimation: {
		oldLayout.resize(newLayout.count());

		for(int i = 0, j = i + 1; i < oldLayout.count() - 1; ++i, ++j)
		oldLayout[i]= oldLayout[j];
		}
		break;
		case MoveBackwordAnimation: {
		oldLayout.resize(newLayout.count());

		for(int i = oldLayout.count() - 1, j = i - 1; i > 0; --i, --j)
		oldLayout[i]= oldLayout[j];
		}
		break;
		default: {
		oldLayout.resize(newLayout.count());
Michal Klocek Refactors layout...	r1965	QRectF rect = m_axis->presenter()->chartsGeometry();
Michal Klocek Refactors axis animation, line animations	r1241	for(int i = 0, j = oldLayout.count() - 1; i < oldLayout.count(); ++i, --j)
		oldLayout[i] = m_axis->axisType() == ChartAxis::X_AXIS ? rect.left() : rect.top();
		}
		break;
		}

		QVariantAnimation::KeyValues value;
		setKeyValues(value); //workaround for wrong interpolation call
		setKeyValueAt(0.0, qVariantFromValue(oldLayout));
		setKeyValueAt(1.0, qVariantFromValue(newLayout));
		}

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

		Q_ASSERT(startVector.count() == endVecotr.count()) ;

Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738	for(int i = 0; i < startVector.count(); i++){
Michal Klocek Animation refactor...	r530	qreal value = startVector[i] + ((endVecotr[i]- startVector[i]) * progress);//qBound(0.0, progress, 1.0));
		result << value;
		}
		return qVariantFromValue(result);
		}


Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738	void AxisAnimation::updateCurrentValue (const QVariant &value )
Michal Klocek Animation refactor...	r530	{
Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738	if (state() != QAbstractAnimation::Stopped)//workaround
Michal Klocek Animation refactor...	r530	{
		QVector<qreal> vector = qVariantValue<QVector<qreal> >(value);
Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738	Q_ASSERT(vector.count() != 0);
Michal Klocek Animation refactor...	r530	m_axis->setLayout(vector);
Michal Klocek Refactors axis animation, line animations	r1241	m_axis->updateGeometry();
Michal Klocek Animation refactor...	r530	}

		}

		QTCOMMERCIALCHART_END_NAMESPACE