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

Fixed bug in setting chart theme...

Fixed bug in setting chart theme The bug was that if you first add a series, then change theme and then restore the original theme, the color of the series was changed even though it should have been restored to match the original color.

Michal Klocek - - Load All Authors

File last commit:

r303:281730f0b1cb


                r312:0677c9dd6d92

Download file

             axisanimationitem.cpp
        
                    71 lines
            
             | 1.9 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / axisanimationitem.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Michal Klocek
    
Refactors axis layout managment...

              r291
            
      #include "axisanimationitem_p.h"

      #include <QPropertyAnimation>

      Q_DECLARE_METATYPE(QVector<qreal>)

      QTCOMMERCIALCHART_BEGIN_NAMESPACE

      const static int duration = 500;

      AxisAnimationItem::AxisAnimationItem(AxisType type,QGraphicsItem* parent) :

      AxisItem(type,parent)

      {

      }

      AxisAnimationItem::~AxisAnimationItem()

      {

      }

      void AxisAnimationItem::updateItems(QVector<qreal>& vector1)

      {

          QVector<qreal> vector0 = vector1;

          calculateLayout(vector1);

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

          vector0.resize(vector1.size());

        Michal Klocek
    
Bugfix missing parent intialization in axis animations

              r303
            
          AxisAnimator *animation = new AxisAnimator(this,this);

        Michal Klocek
    
Refactors axis layout managment...

              r291
            
          animation->setDuration(duration);

          animation->setEasingCurve(QEasingCurve::InOutBack);

          animation->setKeyValueAt(0.0, qVariantFromValue(vector0));

          animation->setKeyValueAt(1.0, qVariantFromValue(vector1));

          animation->start(QAbstractAnimation::DeleteWhenStopped);

      }

      void AxisAnimationItem::setLabelsAngle(int angle)

      {

          AxisItem::setLabelsAngle(angle);

      }

        Michal Klocek
    
Bugfix missing parent intialization in axis animations

              r303
            
      AxisAnimator::AxisAnimator(AxisItem *axis,QObject *parent): QVariantAnimation(parent),

          m_axis(axis)

        Michal Klocek
    
Refactors axis layout managment...

              r291
            
      {

      }

      AxisAnimator::~AxisAnimator()

      {

      }

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

      {

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

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

          QVector<qreal> result;

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

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

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

                 result << value;

          }

          return qVariantFromValue(result);

      }

      void AxisAnimator::updateCurrentValue (const QVariant & value )

      {

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

          m_axis->applyLayout(vector);

      }

      #include "moc_axisanimationitem_p.cpp"

      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

Michal Klocek Refactors axis layout managment...	r291	#include "axisanimationitem_p.h"
		#include <QPropertyAnimation>

		Q_DECLARE_METATYPE(QVector<qreal>)

		QTCOMMERCIALCHART_BEGIN_NAMESPACE

		const static int duration = 500;

		AxisAnimationItem::AxisAnimationItem(AxisType type,QGraphicsItem* parent) :
		AxisItem(type,parent)
		{
		}

		AxisAnimationItem::~AxisAnimationItem()
		{
		}

		void AxisAnimationItem::updateItems(QVector<qreal>& vector1)
		{
		QVector<qreal> vector0 = vector1;
		calculateLayout(vector1);
		if(vector1.count()==0) return;
		vector0.resize(vector1.size());

Michal Klocek Bugfix missing parent intialization in axis animations	r303	AxisAnimator *animation = new AxisAnimator(this,this);
Michal Klocek Refactors axis layout managment...	r291	animation->setDuration(duration);
		animation->setEasingCurve(QEasingCurve::InOutBack);
		animation->setKeyValueAt(0.0, qVariantFromValue(vector0));
		animation->setKeyValueAt(1.0, qVariantFromValue(vector1));
		animation->start(QAbstractAnimation::DeleteWhenStopped);
		}

		void AxisAnimationItem::setLabelsAngle(int angle)
		{
		AxisItem::setLabelsAngle(angle);
		}

Michal Klocek Bugfix missing parent intialization in axis animations	r303	AxisAnimator::AxisAnimator(AxisItem axis,QObject parent): QVariantAnimation(parent),
		m_axis(axis)
Michal Klocek Refactors axis layout managment...	r291	{
		}

		AxisAnimator::~AxisAnimator()
		{
		}

		QVariant AxisAnimator::interpolated(const QVariant &start, const QVariant & end, qreal progress ) const
		{
		QVector<qreal> startVector = qVariantValue<QVector<qreal> >(start);
		QVector<qreal> endVecotr = qVariantValue<QVector<qreal> >(end);
		QVector<qreal> result;
		Q_ASSERT(startVector.count() == endVecotr.count());

		for(int i =0 ;i< startVector.count();i++){
		qreal value = startVector[i] + ((endVecotr[i]- startVector[i]) * progress);//qBound(0.0, progress, 1.0));
		result << value;
		}
		return qVariantFromValue(result);
		}


		void AxisAnimator::updateCurrentValue (const QVariant & value )
		{
		QVector<qreal> vector = qVariantValue<QVector<qreal> >(value);
		m_axis->applyLayout(vector);
		}

		#include "moc_axisanimationitem_p.cpp"

		QTCOMMERCIALCHART_END_NAMESPACE