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

Check that areaseries is actually in chart before trying to update....

Check that areaseries is actually in chart before trying to update. When a line series is used both as a series on chart and as an area series boundary, but not at the same time, animation can sometimes get confused as to what series to update if the area series is removed from the chart and the line series is added to the chart while a series animation is running. Task-number: QTRD-3445 Change-Id: Ia3d72d3ceba784b6e162b2c9b678acdc3e3ffcac Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>

Titta Heikkala - - Load All Authors

File last commit:

r2784:37816a0f0581


                r2800:891ed0097501

Download file

             axisanimation.cpp
        
                    135 lines
            
             | 4.2 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / charts / animations / axisanimation.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Jani Honkonen
    
Add license headers

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

      **

        Titta Heikkala
    
Copyright header changes...

              r2776
            
      ** Copyright (C) 2015 The Qt Company Ltd

        Jani Honkonen
    
Add license headers

              r794
            
      ** All rights reserved.

        Titta Heikkala
    
Copyright header changes...

              r2776
            
      ** For any questions to The Qt Company, please use contact form at http://qt.io

        Jani Honkonen
    
Add license headers

              r794
            
      **

        Titta Heikkala
    
Updated license headers...

              r2740
            
      ** This file is part of the Qt Charts module.

        Jani Honkonen
    
Add license headers

              r794
            
      **

        Titta Heikkala
    
Updated license headers...

              r2740
            
      ** Licensees holding valid commercial license for Qt may use this file in

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

      ** or, alternatively, in accordance with the terms contained in a written

        Titta Heikkala
    
Copyright header changes...

              r2776
            
      ** agreement between you and The Qt Company.

        Jani Honkonen
    
Add license headers

              r794
            
      **

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

        Titta Heikkala
    
Updated license headers...

              r2740
            
      ** contact form at http://qt.io

        Jani Honkonen
    
Add license headers

              r794
            
      **

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

        Titta Heikkala
    
Fix include syntax...

              r2714
            
      #include <private/axisanimation_p.h>

      #include <private/chartaxiselement_p.h>

      #include <private/qabstractaxis_p.h>

        Michal Klocek
    
Animation refactor...

              r530
            
      Q_DECLARE_METATYPE(QVector<qreal>)

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QT_CHARTS_BEGIN_NAMESPACE

        Michal Klocek
    
Animation refactor...

              r530
            
        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
      AxisAnimation::AxisAnimation(ChartAxisElement *axis)

        Jani Honkonen
    
astyle and manual coding style fixes for src-folder

              r2097
            
          : ChartAnimation(axis),

            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)

      {

        Jani Honkonen
    
astyle and manual coding style fixes for src-folder

              r2097
            
          if (state() != QAbstractAnimation::Stopped)

              stop();

          m_type = type;

        Michal Klocek
    
Refactors axis animation, line animations

              r1241
            
      }

        Jani Honkonen
    
more coding style fixes for src-folder...

              r2104
            
      void AxisAnimation::setAnimationPoint(const QPointF &point)

        Michal Klocek
    
Refactors axis animation, line animations

              r1241
            
      {

        Jani Honkonen
    
astyle and manual coding style fixes for src-folder

              r2097
            
          if (state() != QAbstractAnimation::Stopped)

              stop();

          m_point = point;

        Michal Klocek
    
Refactors axis animation, line animations

              r1241
            
      }

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

      {

        Michal Klocek
    
Refactors layout:...

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

        Jani Honkonen
    
astyle and manual coding style fixes for src-folder

              r2097
            
          switch (m_type) {

        Jani Honkonen
    
src folder: another massive victory for coding style police

              r2131
            
          case ZoomOutAnimation: {

              QRectF rect = m_axis->gridGeometry();

              oldLayout.resize(newLayout.count());

        Jani Honkonen
    
astyle and manual coding style fixes for src-folder

              r2097
            
        Jani Honkonen
    
src folder: another massive victory for coding style police

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

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
                  oldLayout[i] = m_axis->axis()->orientation() == Qt::Horizontal ? rect.left() : rect.bottom();

                  oldLayout[j] = m_axis->axis()->orientation() == Qt::Horizontal ? rect.right() : rect.top();

        Jani Honkonen
    
astyle and manual coding style fixes for src-folder

              r2097
            
              }

        Jani Honkonen
    
src folder: another massive victory for coding style police

              r2131
            
          }

          break;

          case ZoomInAnimation: {

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
              int index = qMin(oldLayout.count() * (m_axis->axis()->orientation() == Qt::Horizontal ? m_point.x() : (1 - m_point.y())), newLayout.count() - (qreal)1.0);

        Jani Honkonen
    
src folder: another massive victory for coding style police

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

        Jani Honkonen
    
astyle and manual coding style fixes for src-folder

              r2097
            
        Titta Heikkala
    
Fix axis animation crash...

              r2784
            
              if (index < 0)

                  break;

        Jani Honkonen
    
src folder: another massive victory for coding style police

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

                  oldLayout[i] = oldLayout[index];

          }

          break;

          case MoveForwardAnimation: {

              oldLayout.resize(newLayout.count());

        Jani Honkonen
    
astyle and manual coding style fixes for src-folder

              r2097
            
        Jani Honkonen
    
src folder: another massive victory for coding style police

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

              QRectF rect = m_axis->gridGeometry();

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

        Miikka Heikkinen
    
Add Polar chart support...

              r2483
            
                  oldLayout[i] = m_axis->axis()->orientation() == Qt::Horizontal ? rect.left() : rect.top();

        Jani Honkonen
    
src folder: another massive victory for coding style police

              r2131
            
          }

          break;

        Jani Honkonen
    
astyle and manual coding style fixes for src-folder

              r2097
            
          }

          QVariantAnimation::KeyValues value;

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

          setKeyValueAt(0.0, qVariantFromValue(oldLayout));

          setKeyValueAt(1.0, qVariantFromValue(newLayout));

        Michal Klocek
    
Refactors axis animation, line animations

              r1241
            
      }

        Jani Honkonen
    
astyle and manual coding style fixes for src-folder

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

        Michal Klocek
    
Animation refactor...

              r530
            
      {

        Jani Honkonen
    
Fix deprecation errors from Qt5

              r2241
            
          QVector<qreal> startVector = qvariant_cast<QVector<qreal> >(start);

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

        Michal Klocek
    
Animation refactor...

              r530
            
          QVector<qreal> result;

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

        Jani Honkonen
    
astyle and manual coding style fixes for src-folder

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

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
              qreal value = startVector[i] + ((endVecotr[i] - startVector[i]) * progress);

        Jani Honkonen
    
astyle and manual coding style fixes for src-folder

              r2097
            
              result << value;

        Michal Klocek
    
Animation refactor...

              r530
            
          }

          return qVariantFromValue(result);

      }

        Jani Honkonen
    
astyle and manual coding style fixes for src-folder

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

        Michal Klocek
    
Animation refactor...

              r530
            
      {

        Jani Honkonen
    
astyle and manual coding style fixes for src-folder

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

        Jani Honkonen
    
Fix deprecation errors from Qt5

              r2241
            
              QVector<qreal> vector = qvariant_cast<QVector<qreal> >(value);

        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
            
          }

      }

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QT_CHARTS_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	/****************************************************************************
		**
Titta Heikkala Copyright header changes...	r2776	** Copyright (C) 2015 The Qt Company Ltd
Jani Honkonen Add license headers	r794	** All rights reserved.
Titta Heikkala Copyright header changes...	r2776	** For any questions to The Qt Company, please use contact form at http://qt.io
Jani Honkonen Add license headers	r794	**
Titta Heikkala Updated license headers...	r2740	** This file is part of the Qt Charts module.
Jani Honkonen Add license headers	r794	**
Titta Heikkala Updated license headers...	r2740	** Licensees holding valid commercial license for Qt may use this file in
		** accordance with the Qt License Agreement provided with the Software
		** or, alternatively, in accordance with the terms contained in a written
Titta Heikkala Copyright header changes...	r2776	** agreement between you and The Qt Company.
Jani Honkonen Add license headers	r794	**
		** If you have questions regarding the use of this file, please use
Titta Heikkala Updated license headers...	r2740	** contact form at http://qt.io
Jani Honkonen Add license headers	r794	**
		****************************************************************************/

Titta Heikkala Fix include syntax...	r2714	#include <private/axisanimation_p.h>
		#include <private/chartaxiselement_p.h>
		#include <private/qabstractaxis_p.h>
Michal Klocek Animation refactor...	r530
		Q_DECLARE_METATYPE(QVector<qreal>)

Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_BEGIN_NAMESPACE
Michal Klocek Animation refactor...	r530

Miikka Heikkinen Add Polar chart support...	r2483	AxisAnimation::AxisAnimation(ChartAxisElement *axis)
Jani Honkonen astyle and manual coding style fixes for src-folder	r2097	: ChartAnimation(axis),
		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)
		{
Jani Honkonen astyle and manual coding style fixes for src-folder	r2097	if (state() != QAbstractAnimation::Stopped)
		stop();
		m_type = type;
Michal Klocek Refactors axis animation, line animations	r1241	}

Jani Honkonen more coding style fixes for src-folder...	r2104	void AxisAnimation::setAnimationPoint(const QPointF &point)
Michal Klocek Refactors axis animation, line animations	r1241	{
Jani Honkonen astyle and manual coding style fixes for src-folder	r2097	if (state() != QAbstractAnimation::Stopped)
		stop();
		m_point = point;
Michal Klocek Refactors axis animation, line animations	r1241	}

		void AxisAnimation::setValues(QVector<qreal> &oldLayout, QVector<qreal> &newLayout)
		{
Michal Klocek Refactors layout:...	r2105	if (state() != QAbstractAnimation::Stopped) stop();
Jani Honkonen astyle and manual coding style fixes for src-folder	r2097
		switch (m_type) {
Jani Honkonen src folder: another massive victory for coding style police	r2131	case ZoomOutAnimation: {
		QRectF rect = m_axis->gridGeometry();
		oldLayout.resize(newLayout.count());
Jani Honkonen astyle and manual coding style fixes for src-folder	r2097
Jani Honkonen src folder: another massive victory for coding style police	r2131	for (int i = 0, j = oldLayout.count() - 1; i < (oldLayout.count() + 1) / 2; ++i, --j) {
Miikka Heikkinen Add Polar chart support...	r2483	oldLayout[i] = m_axis->axis()->orientation() == Qt::Horizontal ? rect.left() : rect.bottom();
		oldLayout[j] = m_axis->axis()->orientation() == Qt::Horizontal ? rect.right() : rect.top();
Jani Honkonen astyle and manual coding style fixes for src-folder	r2097	}
Jani Honkonen src folder: another massive victory for coding style police	r2131	}
		break;
		case ZoomInAnimation: {
Miikka Heikkinen Add Polar chart support...	r2483	int index = qMin(oldLayout.count() * (m_axis->axis()->orientation() == Qt::Horizontal ? m_point.x() : (1 - m_point.y())), newLayout.count() - (qreal)1.0);
Jani Honkonen src folder: another massive victory for coding style police	r2131	oldLayout.resize(newLayout.count());
Jani Honkonen astyle and manual coding style fixes for src-folder	r2097
Titta Heikkala Fix axis animation crash...	r2784	if (index < 0)
		break;
Jani Honkonen src folder: another massive victory for coding style police	r2131	for (int i = 0; i < oldLayout.count(); i++)
		oldLayout[i] = oldLayout[index];
		}
		break;
		case MoveForwardAnimation: {
		oldLayout.resize(newLayout.count());
Jani Honkonen astyle and manual coding style fixes for src-folder	r2097
Jani Honkonen src folder: another massive victory for coding style police	r2131	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());
		QRectF rect = m_axis->gridGeometry();
		for (int i = 0, j = oldLayout.count() - 1; i < oldLayout.count(); ++i, --j)
Miikka Heikkinen Add Polar chart support...	r2483	oldLayout[i] = m_axis->axis()->orientation() == Qt::Horizontal ? rect.left() : rect.top();
Jani Honkonen src folder: another massive victory for coding style police	r2131	}
		break;
Jani Honkonen astyle and manual coding style fixes for src-folder	r2097	}

		QVariantAnimation::KeyValues value;
		setKeyValues(value); //workaround for wrong interpolation call
		setKeyValueAt(0.0, qVariantFromValue(oldLayout));
		setKeyValueAt(1.0, qVariantFromValue(newLayout));
Michal Klocek Refactors axis animation, line animations	r1241	}

Jani Honkonen astyle and manual coding style fixes for src-folder	r2097	QVariant AxisAnimation::interpolated(const QVariant &start, const QVariant &end, qreal progress) const
Michal Klocek Animation refactor...	r530	{
Jani Honkonen Fix deprecation errors from Qt5	r2241	QVector<qreal> startVector = qvariant_cast<QVector<qreal> >(start);
		QVector<qreal> endVecotr = qvariant_cast<QVector<qreal> >(end);
Michal Klocek Animation refactor...	r530	QVector<qreal> result;

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

Jani Honkonen astyle and manual coding style fixes for src-folder	r2097	for (int i = 0; i < startVector.count(); i++) {
Titta Heikkala Qt Charts project file structure change...	r2712	qreal value = startVector[i] + ((endVecotr[i] - startVector[i]) * progress);
Jani Honkonen astyle and manual coding style fixes for src-folder	r2097	result << value;
Michal Klocek Animation refactor...	r530	}
		return qVariantFromValue(result);
		}


Jani Honkonen astyle and manual coding style fixes for src-folder	r2097	void AxisAnimation::updateCurrentValue(const QVariant &value)
Michal Klocek Animation refactor...	r530	{
Jani Honkonen astyle and manual coding style fixes for src-folder	r2097	if (state() != QAbstractAnimation::Stopped) { //workaround
Jani Honkonen Fix deprecation errors from Qt5	r2241	QVector<qreal> vector = qvariant_cast<QVector<qreal> >(value);
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	}

		}

Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_END_NAMESPACE