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

Fix crash with boxplottertester brush...

Fix crash with boxplottertester brush The test sets the brush for the second set in the first series. It is checked that the set exists before setting the brush for it. Change-Id: Id677ab781953bf7cc789f316d92c137873d4f624 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

Miikka Heikkinen - - Load All Authors

File last commit:

r2574:599370d0561c


                r2635:d3155254bba4

Download file

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

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

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

      **

      ** Copyright (C) 2013 Digia Plc

      ** All rights reserved.

      ** For any questions to Digia, please use contact form at http://qt.digia.com

      **

        Miikka Heikkinen
    
Qt Commercial -> Qt Enterprise...

              r2574
            
      ** This file is part of the Qt Enterprise Charts Add-on.

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

              r2548
            
      **

      ** $QT_BEGIN_LICENSE$

        Miikka Heikkinen
    
Qt Commercial -> Qt Enterprise...

              r2574
            
      ** Licensees holding valid Qt Enterprise licenses may use this file in

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

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

              r2548
            
      ** 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$

      **

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

      #include "boxwhiskersanimation_p.h"

      #include "boxplotanimation_p.h"

      #include "boxplotchartitem_p.h"

      #include "boxwhiskersdata_p.h"

      Q_DECLARE_METATYPE(QVector<QRectF>)

      Q_DECLARE_METATYPE(QTCOMMERCIALCHART_NAMESPACE::BoxWhiskersData)

      Q_DECLARE_METATYPE(qreal)

      QTCOMMERCIALCHART_BEGIN_NAMESPACE

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

            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"

      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

Mika Salmela A new box-and-whiskers series type added to charts....	r2548	/****************************************************************************
		**
		** Copyright (C) 2013 Digia Plc
		** All rights reserved.
		** For any questions to Digia, please use contact form at http://qt.digia.com
		**
Miikka Heikkinen Qt Commercial -> Qt Enterprise...	r2574	** This file is part of the Qt Enterprise Charts Add-on.
Mika Salmela A new box-and-whiskers series type added to charts....	r2548	**
		** $QT_BEGIN_LICENSE$
Miikka Heikkinen Qt Commercial -> Qt Enterprise...	r2574	** Licensees holding valid Qt Enterprise licenses may use this file in
		** accordance with the Qt Enterprise License Agreement provided with the
Mika Salmela A new box-and-whiskers series type added to charts....	r2548	** 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$
		**
		****************************************************************************/

		#include "boxwhiskersanimation_p.h"
		#include "boxplotanimation_p.h"
		#include "boxplotchartitem_p.h"
		#include "boxwhiskersdata_p.h"

		Q_DECLARE_METATYPE(QVector<QRectF>)
		Q_DECLARE_METATYPE(QTCOMMERCIALCHART_NAMESPACE::BoxWhiskersData)
		Q_DECLARE_METATYPE(qreal)

		QTCOMMERCIALCHART_BEGIN_NAMESPACE

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),
		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"

		QTCOMMERCIALCHART_END_NAMESPACE