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

Fix pie autotests...

Fix pie autotests Legend is now on by default which broke some tests.

Michal Klocek - - Load All Authors

File last commit:

r1006:a8ef6d6db8bf


                r1192:28f90ff1c65f

Download file

             axisanimation.cpp
        
                    65 lines
            
             | 1.9 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"

      #include <QTimer>

      Q_DECLARE_METATYPE(QVector<qreal>)

      QTCOMMERCIALCHART_BEGIN_NAMESPACE

        Michal Klocek
    
Changes QChartAxis -> QAxis

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

        Michal Klocek
    
Animation refactor...

              r530
            
          m_axis(axis)

      {

      }

      AxisAnimation::~AxisAnimation()

      {

      }

        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);

          }

      }

      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"
		#include <QTimer>

		Q_DECLARE_METATYPE(QVector<qreal>)

		QTCOMMERCIALCHART_BEGIN_NAMESPACE


Michal Klocek Changes QChartAxis -> QAxis	r1006	AxisAnimation::AxisAnimation(ChartAxis *axis): ChartAnimation(axis),
Michal Klocek Animation refactor...	r530	m_axis(axis)
		{
		}

		AxisAnimation::~AxisAnimation()
		{
		}

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);
		}

		}

		QTCOMMERCIALCHART_END_NAMESPACE