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

Fix pie autotests...

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

Jani Honkonen - - Load All Authors

File last commit:

r1079:1181d21f7863


                r1192:28f90ff1c65f

Download file

             pieanimation.cpp
        
                    100 lines
            
             | 3.1 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / animations / pieanimation.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
    
minor . compilation fix

              r623
            
      #include "pieanimation_p.h"

        Jani Honkonen
    
Add animations to pie. Works but has some visual issues when adding slices.

              r618
            
      #include "piesliceanimation_p.h"

      #include "piechartitem_p.h"

      #include <QTimer>

      QTCOMMERCIALCHART_BEGIN_NAMESPACE

      PieAnimation::PieAnimation(PieChartItem *item)

          :ChartAnimation(item),

          m_item(item)

      {

      }

      PieAnimation::~PieAnimation()

      {

      }

        Jani Honkonen
    
Refactor piechart to avoid using invalid QPieSlice pointers....

              r1053
            
      void PieAnimation::updateValue(PieSliceItem *sliceItem, const PieSliceData &sliceData)

        Jani Honkonen
    
Add animations to pie. Works but has some visual issues when adding slices.

              r618
            
      {

        Jani Honkonen
    
Refactor piechart to avoid using invalid QPieSlice pointers....

              r1053
            
          PieSliceAnimation *animation = m_animations.value(sliceItem);

        Jani Honkonen
    
Add animations to pie. Works but has some visual issues when adding slices.

              r618
            
          Q_ASSERT(animation);

          animation->stop();

        Jani Honkonen
    
Refactoring pie series and animations.

              r621
            
        Jani Honkonen
    
Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.

              r668
            
          animation->updateValue(sliceData);

        Jani Honkonen
    
Use same animation duration for all series animations.

              r1079
            
          animation->setDuration(ChartAnimationDuration);

        Jani Honkonen
    
Refactoring pie series and animations.

              r621
            
          animation->setEasingCurve(QEasingCurve::OutQuart);

          QTimer::singleShot(0, animation, SLOT(start()));

      }

        Jani Honkonen
    
Refactor graphical side of pie to simplify the implementation.

              r1074
            
      void PieAnimation::addSlice(PieSliceItem *sliceItem, const PieSliceData &sliceData, bool startupAnimation)

        Jani Honkonen
    
Refactoring pie series and animations.

              r621
            
      {

        Jani Honkonen
    
Refactor piechart to avoid using invalid QPieSlice pointers....

              r1053
            
          PieSliceAnimation *animation = new PieSliceAnimation(sliceItem);

          m_animations.insert(sliceItem, animation);

        Jani Honkonen
    
Refactoring pie series and animations.

              r621
            
        Jani Honkonen
    
Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.

              r668
            
          PieSliceData startValue = sliceData;

          startValue.m_radius = 0;

        Jani Honkonen
    
Refactor graphical side of pie to simplify the implementation.

              r1074
            
          if (startupAnimation)

        Jani Honkonen
    
Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.

              r668
            
              startValue.m_startAngle = 0;

        Jani Honkonen
    
Nicer animation for adding a pie initially.

              r634
            
          else

        Marek Rosa
    
Animation folder formating: white spaces, brackets, etc fixed

              r738
            
              startValue.m_startAngle = sliceData.m_startAngle + (sliceData.m_angleSpan / 2);

        Jani Honkonen
    
Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.

              r668
            
          startValue.m_angleSpan = 0;

          animation->setValue(startValue, sliceData);

        Jani Honkonen
    
Refactoring pie series and animations.

              r621
            
        Jani Honkonen
    
Use same animation duration for all series animations.

              r1079
            
          animation->setDuration(ChartAnimationDuration);

        Jani Honkonen
    
Refactoring pie series and animations.

              r621
            
          animation->setEasingCurve(QEasingCurve::OutQuart);

          QTimer::singleShot(0, animation, SLOT(start()));

      }

        Jani Honkonen
    
Refactor piechart to avoid using invalid QPieSlice pointers....

              r1053
            
      void PieAnimation::removeSlice(PieSliceItem *sliceItem)

        Jani Honkonen
    
Refactoring pie series and animations.

              r621
            
      {

        Jani Honkonen
    
Refactor piechart to avoid using invalid QPieSlice pointers....

              r1053
            
          PieSliceAnimation *animation = m_animations.value(sliceItem);

        Jani Honkonen
    
Refactoring pie series and animations.

              r621
            
          Q_ASSERT(animation);

          animation->stop();

        Jani Honkonen
    
Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.

              r668
            
          PieSliceData endValue = animation->currentSliceValue();

          endValue.m_radius = 0;

          endValue.m_startAngle = endValue.m_startAngle + endValue.m_angleSpan;

          endValue.m_angleSpan = 0;

        Jani Honkonen
    
Slice remove animation hides the label

              r1075
            
          endValue.m_isLabelVisible = false;

        Jani Honkonen
    
Refactoring pie series and animations.

              r621
            
        Jani Honkonen
    
Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.

              r668
            
          animation->updateValue(endValue);

        Jani Honkonen
    
Use same animation duration for all series animations.

              r1079
            
          animation->setDuration(ChartAnimationDuration);

        Jani Honkonen
    
Add animations to pie. Works but has some visual issues when adding slices.

              r618
            
          animation->setEasingCurve(QEasingCurve::OutQuart);

        Jani Honkonen
    
Refactoring pie series and animations.

              r621
            
        Jani Honkonen
    
Refactor piechart to avoid using invalid QPieSlice pointers....

              r1053
            
          // PieSliceItem is the parent of PieSliceAnimation so the animation will be deleted as well..

          connect(animation, SIGNAL(finished()), sliceItem, SLOT(deleteLater()));

          m_animations.remove(sliceItem);

        Jani Honkonen
    
Add animations to pie. Works but has some visual issues when adding slices.

              r618
            
          QTimer::singleShot(0, animation, SLOT(start()));

      }

      void PieAnimation::updateCurrentValue(const QVariant &)

      {

          // nothing to do...

      }

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

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 minor . compilation fix	r623	#include "pieanimation_p.h"
Jani Honkonen Add animations to pie. Works but has some visual issues when adding slices.	r618	#include "piesliceanimation_p.h"
		#include "piechartitem_p.h"
		#include <QTimer>

		QTCOMMERCIALCHART_BEGIN_NAMESPACE

		PieAnimation::PieAnimation(PieChartItem *item)
		:ChartAnimation(item),
		m_item(item)
		{
		}

		PieAnimation::~PieAnimation()
		{
		}

Jani Honkonen Refactor piechart to avoid using invalid QPieSlice pointers....	r1053	void PieAnimation::updateValue(PieSliceItem *sliceItem, const PieSliceData &sliceData)
Jani Honkonen Add animations to pie. Works but has some visual issues when adding slices.	r618	{
Jani Honkonen Refactor piechart to avoid using invalid QPieSlice pointers....	r1053	PieSliceAnimation *animation = m_animations.value(sliceItem);
Jani Honkonen Add animations to pie. Works but has some visual issues when adding slices.	r618	Q_ASSERT(animation);
		animation->stop();
Jani Honkonen Refactoring pie series and animations.	r621
Jani Honkonen Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.	r668	animation->updateValue(sliceData);
Jani Honkonen Use same animation duration for all series animations.	r1079	animation->setDuration(ChartAnimationDuration);
Jani Honkonen Refactoring pie series and animations.	r621	animation->setEasingCurve(QEasingCurve::OutQuart);

		QTimer::singleShot(0, animation, SLOT(start()));
		}

Jani Honkonen Refactor graphical side of pie to simplify the implementation.	r1074	void PieAnimation::addSlice(PieSliceItem *sliceItem, const PieSliceData &sliceData, bool startupAnimation)
Jani Honkonen Refactoring pie series and animations.	r621	{
Jani Honkonen Refactor piechart to avoid using invalid QPieSlice pointers....	r1053	PieSliceAnimation *animation = new PieSliceAnimation(sliceItem);
		m_animations.insert(sliceItem, animation);
Jani Honkonen Refactoring pie series and animations.	r621
Jani Honkonen Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.	r668	PieSliceData startValue = sliceData;
		startValue.m_radius = 0;
Jani Honkonen Refactor graphical side of pie to simplify the implementation.	r1074	if (startupAnimation)
Jani Honkonen Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.	r668	startValue.m_startAngle = 0;
Jani Honkonen Nicer animation for adding a pie initially.	r634	else
Marek Rosa Animation folder formating: white spaces, brackets, etc fixed	r738	startValue.m_startAngle = sliceData.m_startAngle + (sliceData.m_angleSpan / 2);
Jani Honkonen Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.	r668	startValue.m_angleSpan = 0;
		animation->setValue(startValue, sliceData);
Jani Honkonen Refactoring pie series and animations.	r621
Jani Honkonen Use same animation duration for all series animations.	r1079	animation->setDuration(ChartAnimationDuration);
Jani Honkonen Refactoring pie series and animations.	r621	animation->setEasingCurve(QEasingCurve::OutQuart);
		QTimer::singleShot(0, animation, SLOT(start()));
		}

Jani Honkonen Refactor piechart to avoid using invalid QPieSlice pointers....	r1053	void PieAnimation::removeSlice(PieSliceItem *sliceItem)
Jani Honkonen Refactoring pie series and animations.	r621	{
Jani Honkonen Refactor piechart to avoid using invalid QPieSlice pointers....	r1053	PieSliceAnimation *animation = m_animations.value(sliceItem);
Jani Honkonen Refactoring pie series and animations.	r621	Q_ASSERT(animation);
		animation->stop();

Jani Honkonen Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.	r668	PieSliceData endValue = animation->currentSliceValue();
		endValue.m_radius = 0;
		endValue.m_startAngle = endValue.m_startAngle + endValue.m_angleSpan;
		endValue.m_angleSpan = 0;
Jani Honkonen Slice remove animation hides the label	r1075	endValue.m_isLabelVisible = false;
Jani Honkonen Refactoring pie series and animations.	r621
Jani Honkonen Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.	r668	animation->updateValue(endValue);
Jani Honkonen Use same animation duration for all series animations.	r1079	animation->setDuration(ChartAnimationDuration);
Jani Honkonen Add animations to pie. Works but has some visual issues when adding slices.	r618	animation->setEasingCurve(QEasingCurve::OutQuart);
Jani Honkonen Refactoring pie series and animations.	r621
Jani Honkonen Refactor piechart to avoid using invalid QPieSlice pointers....	r1053	// PieSliceItem is the parent of PieSliceAnimation so the animation will be deleted as well..
		connect(animation, SIGNAL(finished()), sliceItem, SLOT(deleteLater()));
		m_animations.remove(sliceItem);

Jani Honkonen Add animations to pie. Works but has some visual issues when adding slices.	r618	QTimer::singleShot(0, animation, SLOT(start()));
		}

		void PieAnimation::updateCurrentValue(const QVariant &)
		{
		// nothing to do...
		}

		#include "moc_pieanimation_p.cpp"

		QTCOMMERCIALCHART_END_NAMESPACE