HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/charts/animations/boxwhiskersanimation.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:

r2776:bc1f6aa59d42


                r2800:891ed0097501

Download file

             boxwhiskersanimation.cpp
        
                    109 lines
            
             | 4.0 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / charts / animations / boxwhiskersanimation.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548
            
      /****************************************************************************

      **

        Titta Heikkala
    
Copyright header changes...

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

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548
            
      ** All rights reserved.

        Titta Heikkala
    
Copyright header changes...

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

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548
            
      **

        Titta Heikkala
    
Updated license headers...

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

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548
            
      **

        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.

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548
            
      **

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

        Titta Heikkala
    
Updated license headers...

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

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548
            
      **

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

        Titta Heikkala
    
Fix include syntax...

              r2714
            
      #include <private/boxwhiskersanimation_p.h>

      #include <private/boxplotanimation_p.h>

      #include <private/boxplotchartitem_p.h>

      #include <private/boxwhiskersdata_p.h>

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548
            
      Q_DECLARE_METATYPE(QVector<QRectF>)

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      Q_DECLARE_METATYPE(QT_CHARTS_NAMESPACE::BoxWhiskersData)

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548
            
      Q_DECLARE_METATYPE(qreal)

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QT_CHARTS_BEGIN_NAMESPACE

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548
            
        Miikka Heikkinen
    
Further crash fixes to boxplot...

              r2561
            
      BoxWhiskersAnimation::BoxWhiskersAnimation(BoxWhiskers *box, BoxPlotAnimation *boxPlotAnimation)

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548
            
          : ChartAnimation(box),

        Miikka Heikkinen
    
Further crash fixes to boxplot...

              r2561
            
            m_box(box),

        Miikka Heikkinen
    
Plugged some memory leaks....

              r2733
            
            m_changeAnimation(false),

        Miikka Heikkinen
    
Further crash fixes to boxplot...

              r2561
            
            m_boxPlotAnimation(boxPlotAnimation)

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548
            
      {

          setDuration(ChartAnimationDuration);

          setEasingCurve(QEasingCurve::OutQuart);

      }

      BoxWhiskersAnimation::~BoxWhiskersAnimation()

      {

        Miikka Heikkinen
    
Further crash fixes to boxplot...

              r2561
            
          if (m_boxPlotAnimation)

              m_boxPlotAnimation->removeBoxAnimation(m_box);

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548
            
      }

      QVariant BoxWhiskersAnimation::interpolated(const QVariant &from, const QVariant &to, qreal progress) const

      {

          BoxWhiskersData startData = qvariant_cast<BoxWhiskersData>(from);

          BoxWhiskersData endData = qvariant_cast<BoxWhiskersData>(to);

          BoxWhiskersData result;

        Miikka Heikkinen
    
Fix animation artifact with boxplots....

              r2564
            
          if (m_changeAnimation) {

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548
            
              result.m_lowerExtreme = startData.m_lowerExtreme + progress * (endData.m_lowerExtreme - startData.m_lowerExtreme);

              result.m_lowerQuartile = startData.m_lowerQuartile + progress * (endData.m_lowerQuartile - startData.m_lowerQuartile);

              result.m_median = startData.m_median + progress * (endData.m_median - startData.m_median);

              result.m_upperQuartile = startData.m_upperQuartile + progress * (endData.m_upperQuartile - startData.m_upperQuartile);

              result.m_upperExtreme = startData.m_upperExtreme + progress * (endData.m_upperExtreme - startData.m_upperExtreme);

          } else {

              result.m_lowerExtreme = endData.m_median + progress * (endData.m_lowerExtreme - endData.m_median);

              result.m_lowerQuartile = endData.m_median + progress * (endData.m_lowerQuartile - endData.m_median);

              result.m_median = endData.m_median;

              result.m_upperQuartile = endData.m_median + progress * (endData.m_upperQuartile - endData.m_median);

              result.m_upperExtreme = endData.m_median + progress * (endData.m_upperExtreme - endData.m_median);

          }

          result.m_index = endData.m_index;

          result.m_boxItems = endData.m_boxItems;

          result.m_maxX = endData.m_maxX;

          result.m_minX = endData.m_minX;

          result.m_maxY = endData.m_maxY;

          result.m_minY = endData.m_minY;

          result.m_seriesIndex = endData.m_seriesIndex;

          result.m_seriesCount = endData.m_seriesCount;

          return qVariantFromValue(result);

      }

      void BoxWhiskersAnimation::updateCurrentValue(const QVariant &value)

      {

          BoxWhiskersData data = qvariant_cast<BoxWhiskersData>(value);

          m_box->setLayout(data);

      }

      void BoxWhiskersAnimation::setup(const BoxWhiskersData &startData, const BoxWhiskersData &endData)

      {

          setKeyValueAt(0.0, qVariantFromValue(startData));

          setKeyValueAt(1.0, qVariantFromValue(endData));

      }

      void BoxWhiskersAnimation::setEndData(const BoxWhiskersData &endData)

      {

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

              stop();

          setEndValue(qVariantFromValue(endData));

      }

      void BoxWhiskersAnimation::setStartData(const BoxWhiskersData &endData)

      {

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

              stop();

          setStartValue(qVariantFromValue(endData));

      }

      #include "moc_boxwhiskersanimation_p.cpp"

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QT_CHARTS_END_NAMESPACE

        Mika Salmela
    
A new box-and-whiskers series type added to charts....

              r2548

	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

Mika Salmela A new box-and-whiskers series type added to charts....	r2548	/****************************************************************************
		**
Titta Heikkala Copyright header changes...	r2776	** Copyright (C) 2015 The Qt Company Ltd
Mika Salmela A new box-and-whiskers series type added to charts....	r2548	** All rights reserved.
Titta Heikkala Copyright header changes...	r2776	** For any questions to The Qt Company, please use contact form at http://qt.io
Mika Salmela A new box-and-whiskers series type added to charts....	r2548	**
Titta Heikkala Updated license headers...	r2740	** This file is part of the Qt Charts module.
Mika Salmela A new box-and-whiskers series type added to charts....	r2548	**
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.
Mika Salmela A new box-and-whiskers series type added to charts....	r2548	**
		** If you have questions regarding the use of this file, please use
Titta Heikkala Updated license headers...	r2740	** contact form at http://qt.io
Mika Salmela A new box-and-whiskers series type added to charts....	r2548	**
		****************************************************************************/

Titta Heikkala Fix include syntax...	r2714	#include <private/boxwhiskersanimation_p.h>
		#include <private/boxplotanimation_p.h>
		#include <private/boxplotchartitem_p.h>
		#include <private/boxwhiskersdata_p.h>
Mika Salmela A new box-and-whiskers series type added to charts....	r2548
		Q_DECLARE_METATYPE(QVector<QRectF>)
Titta Heikkala Qt Charts project file structure change...	r2712	Q_DECLARE_METATYPE(QT_CHARTS_NAMESPACE::BoxWhiskersData)
Mika Salmela A new box-and-whiskers series type added to charts....	r2548	Q_DECLARE_METATYPE(qreal)

Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_BEGIN_NAMESPACE
Mika Salmela A new box-and-whiskers series type added to charts....	r2548
Miikka Heikkinen Further crash fixes to boxplot...	r2561	BoxWhiskersAnimation::BoxWhiskersAnimation(BoxWhiskers box, BoxPlotAnimation boxPlotAnimation)
Mika Salmela A new box-and-whiskers series type added to charts....	r2548	: ChartAnimation(box),
Miikka Heikkinen Further crash fixes to boxplot...	r2561	m_box(box),
Miikka Heikkinen Plugged some memory leaks....	r2733	m_changeAnimation(false),
Miikka Heikkinen Further crash fixes to boxplot...	r2561	m_boxPlotAnimation(boxPlotAnimation)
Mika Salmela A new box-and-whiskers series type added to charts....	r2548	{
		setDuration(ChartAnimationDuration);
		setEasingCurve(QEasingCurve::OutQuart);
		}

		BoxWhiskersAnimation::~BoxWhiskersAnimation()
		{
Miikka Heikkinen Further crash fixes to boxplot...	r2561	if (m_boxPlotAnimation)
		m_boxPlotAnimation->removeBoxAnimation(m_box);
Mika Salmela A new box-and-whiskers series type added to charts....	r2548	}

		QVariant BoxWhiskersAnimation::interpolated(const QVariant &from, const QVariant &to, qreal progress) const
		{
		BoxWhiskersData startData = qvariant_cast<BoxWhiskersData>(from);
		BoxWhiskersData endData = qvariant_cast<BoxWhiskersData>(to);
		BoxWhiskersData result;

Miikka Heikkinen Fix animation artifact with boxplots....	r2564	if (m_changeAnimation) {
Mika Salmela A new box-and-whiskers series type added to charts....	r2548	result.m_lowerExtreme = startData.m_lowerExtreme + progress * (endData.m_lowerExtreme - startData.m_lowerExtreme);
		result.m_lowerQuartile = startData.m_lowerQuartile + progress * (endData.m_lowerQuartile - startData.m_lowerQuartile);
		result.m_median = startData.m_median + progress * (endData.m_median - startData.m_median);
		result.m_upperQuartile = startData.m_upperQuartile + progress * (endData.m_upperQuartile - startData.m_upperQuartile);
		result.m_upperExtreme = startData.m_upperExtreme + progress * (endData.m_upperExtreme - startData.m_upperExtreme);
		} else {
		result.m_lowerExtreme = endData.m_median + progress * (endData.m_lowerExtreme - endData.m_median);
		result.m_lowerQuartile = endData.m_median + progress * (endData.m_lowerQuartile - endData.m_median);
		result.m_median = endData.m_median;
		result.m_upperQuartile = endData.m_median + progress * (endData.m_upperQuartile - endData.m_median);
		result.m_upperExtreme = endData.m_median + progress * (endData.m_upperExtreme - endData.m_median);
		}
		result.m_index = endData.m_index;
		result.m_boxItems = endData.m_boxItems;

		result.m_maxX = endData.m_maxX;
		result.m_minX = endData.m_minX;
		result.m_maxY = endData.m_maxY;
		result.m_minY = endData.m_minY;
		result.m_seriesIndex = endData.m_seriesIndex;
		result.m_seriesCount = endData.m_seriesCount;

		return qVariantFromValue(result);
		}

		void BoxWhiskersAnimation::updateCurrentValue(const QVariant &value)
		{
		BoxWhiskersData data = qvariant_cast<BoxWhiskersData>(value);
		m_box->setLayout(data);
		}

		void BoxWhiskersAnimation::setup(const BoxWhiskersData &startData, const BoxWhiskersData &endData)
		{
		setKeyValueAt(0.0, qVariantFromValue(startData));
		setKeyValueAt(1.0, qVariantFromValue(endData));
		}

		void BoxWhiskersAnimation::setEndData(const BoxWhiskersData &endData)
		{
		if (state() != QAbstractAnimation::Stopped)
		stop();

		setEndValue(qVariantFromValue(endData));
		}

		void BoxWhiskersAnimation::setStartData(const BoxWhiskersData &endData)
		{
		if (state() != QAbstractAnimation::Stopped)
		stop();

		setStartValue(qVariantFromValue(endData));
		}

		#include "moc_boxwhiskersanimation_p.cpp"

Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_END_NAMESPACE
Mika Salmela A new box-and-whiskers series type added to charts....	r2548