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

Fix label truncate issues with multiple axes...

Fix label truncate issues with multiple axes If there were multiple axes on single side of the chart, the axes wider/higher than average never got their preferred size, causing labels to truncate. Fixed by calculating the required squeeze ratio instead of just blindly using even fraction of available space. Task-number: QTRD-1897 Reviewed-by: Mika Salmela

Jani Honkonen - - Load All Authors

File last commit:

r2321:9b8615dbb840


                r2411:6fca0e6f42a3

Download file

             piesliceanimation.cpp
        
                    128 lines
            
             | 4.3 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / animations / piesliceanimation.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 "piesliceanimation_p.h"

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

              r618
            
      #include "piechartitem_p.h"

        Jani Honkonen
    
Namespace fix for piesliceanimation

              r821
            
      Q_DECLARE_METATYPE(QTCOMMERCIALCHART_NAMESPACE::PieSliceData)

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

              r618
            
      QTCOMMERCIALCHART_BEGIN_NAMESPACE

      qreal linearPos(qreal start, qreal end, qreal pos)

      {

          return start + ((end - start) * pos);

      }

      QPointF linearPos(QPointF start, QPointF end, qreal pos)

      {

          qreal x = linearPos(start.x(), end.x(), pos);

          qreal y = linearPos(start.y(), end.y(), pos);

          return QPointF(x, y);

      }

        Jani Honkonen
    
Fix add/remove animation for pie and apply colors from theme when adding/removing

              r659
            
      QPen linearPos(QPen start, QPen end, qreal pos)

      {

          QColor c;

          c.setRedF(linearPos(start.color().redF(), end.color().redF(), pos));

          c.setGreenF(linearPos(start.color().greenF(), end.color().greenF(), pos));

          c.setBlueF(linearPos(start.color().blueF(), end.color().blueF(), pos));

          end.setColor(c);

          return end;

      }

      QBrush linearPos(QBrush start, QBrush end, qreal pos)

      {

          QColor c;

          c.setRedF(linearPos(start.color().redF(), end.color().redF(), pos));

          c.setGreenF(linearPos(start.color().greenF(), end.color().greenF(), pos));

          c.setBlueF(linearPos(start.color().blueF(), end.color().blueF(), pos));

          end.setColor(c);

          return end;

      }

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

              r1053
            
      PieSliceAnimation::PieSliceAnimation(PieSliceItem *sliceItem)

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

              r2097
            
          : ChartAnimation(sliceItem),

        Jani Honkonen
    
Fix pie animation chrash

              r2321
            
            m_sliceItem(sliceItem),

            m_currentValue(m_sliceItem->m_data)

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

              r618
            
      {

        Jani Honkonen
    
Fix pie animation chrash

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

              r618
            
      }

      PieSliceAnimation::~PieSliceAnimation()

      {

      }

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

              r668
            
      void PieSliceAnimation::setValue(const PieSliceData &startValue, const PieSliceData &endValue)

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

              r618
            
      {

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

              stop();

        Jani Honkonen
    
Fix add/remove animation for pie and apply colors from theme when adding/removing

              r659
            
          m_currentValue = startValue;

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

              r618
            
          setKeyValueAt(0.0, qVariantFromValue(startValue));

          setKeyValueAt(1.0, qVariantFromValue(endValue));

      }

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

              r668
            
      void PieSliceAnimation::updateValue(const PieSliceData &endValue)

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

              r618
            
      {

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

              stop();

        Jani Honkonen
    
Fix add/remove animation for pie and apply colors from theme when adding/removing

              r659
            
          setKeyValueAt(0.0, qVariantFromValue(m_currentValue));

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

              r618
            
          setKeyValueAt(1.0, qVariantFromValue(endValue));

      }

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

              r668
            
      PieSliceData PieSliceAnimation::currentSliceValue()

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

              r618
            
      {

        Jani Honkonen
    
Fix add/remove animation for pie and apply colors from theme when adding/removing

              r659
            
          // NOTE:

          // We must use an internal current value because QVariantAnimation::currentValue() is updated

          // before the animation is actually started. So if we get 2 updateValue() calls in a row the currentValue()

          // will have the end value set from the first call and the second call will interpolate that instead of

          // the original current value as it was before the first call.

          return m_currentValue;

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

              r618
            
      }

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

      {

        Jani Honkonen
    
Fix deprecation errors from Qt5

              r2241
            
          PieSliceData startValue = qvariant_cast<PieSliceData>(start);

          PieSliceData endValue = qvariant_cast<PieSliceData>(end);

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

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

              r668
            
          PieSliceData result;

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

              r618
            
          result = endValue;

          result.m_center = linearPos(startValue.m_center, endValue.m_center, progress);

          result.m_radius = linearPos(startValue.m_radius, endValue.m_radius, progress);

          result.m_startAngle = linearPos(startValue.m_startAngle, endValue.m_startAngle, progress);

          result.m_angleSpan = linearPos(startValue.m_angleSpan, endValue.m_angleSpan, progress);

        Jani Honkonen
    
Adding PIMPL to pie

              r669
            
          result.m_slicePen = linearPos(startValue.m_slicePen, endValue.m_slicePen, progress);

          result.m_sliceBrush = linearPos(startValue.m_sliceBrush, endValue.m_sliceBrush, progress);

        Marek Rosa
    
Donut support simplified. Examples updated

              r1838
            
          result.m_holeRadius = linearPos(startValue.m_holeRadius, endValue.m_holeRadius, progress);

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

              r618
            
          return qVariantFromValue(result);

      }

      void PieSliceAnimation::updateCurrentValue(const QVariant &value)

      {

        Jani Honkonen
    
Fix add/remove animation for pie and apply colors from theme when adding/removing

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

        Jani Honkonen
    
Fix deprecation errors from Qt5

              r2241
            
              m_currentValue = qvariant_cast<PieSliceData>(value);

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

              r1074
            
              m_sliceItem->setLayout(m_currentValue);

        Jani Honkonen
    
Fix add/remove animation for pie and apply colors from theme when adding/removing

              r659
            
          }

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

              r618
            
      }

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

Jani Honkonen Namespace fix for piesliceanimation	r821	Q_DECLARE_METATYPE(QTCOMMERCIALCHART_NAMESPACE::PieSliceData)
Jani Honkonen Add animations to pie. Works but has some visual issues when adding slices.	r618
		QTCOMMERCIALCHART_BEGIN_NAMESPACE

		qreal linearPos(qreal start, qreal end, qreal pos)
		{
		return start + ((end - start) * pos);
		}

		QPointF linearPos(QPointF start, QPointF end, qreal pos)
		{
		qreal x = linearPos(start.x(), end.x(), pos);
		qreal y = linearPos(start.y(), end.y(), pos);
		return QPointF(x, y);
		}

Jani Honkonen Fix add/remove animation for pie and apply colors from theme when adding/removing	r659	QPen linearPos(QPen start, QPen end, qreal pos)
		{
		QColor c;
		c.setRedF(linearPos(start.color().redF(), end.color().redF(), pos));
		c.setGreenF(linearPos(start.color().greenF(), end.color().greenF(), pos));
		c.setBlueF(linearPos(start.color().blueF(), end.color().blueF(), pos));
		end.setColor(c);
		return end;
		}

		QBrush linearPos(QBrush start, QBrush end, qreal pos)
		{
		QColor c;
		c.setRedF(linearPos(start.color().redF(), end.color().redF(), pos));
		c.setGreenF(linearPos(start.color().greenF(), end.color().greenF(), pos));
		c.setBlueF(linearPos(start.color().blueF(), end.color().blueF(), pos));
		end.setColor(c);
		return end;
		}

Jani Honkonen Refactor piechart to avoid using invalid QPieSlice pointers....	r1053	PieSliceAnimation::PieSliceAnimation(PieSliceItem *sliceItem)
Jani Honkonen astyle and manual coding style fixes for src-folder	r2097	: ChartAnimation(sliceItem),
Jani Honkonen Fix pie animation chrash	r2321	m_sliceItem(sliceItem),
		m_currentValue(m_sliceItem->m_data)
Jani Honkonen Add animations to pie. Works but has some visual issues when adding slices.	r618	{
Jani Honkonen Fix pie animation chrash	r2321
Jani Honkonen Add animations to pie. Works but has some visual issues when adding slices.	r618	}

		PieSliceAnimation::~PieSliceAnimation()
		{
		}

Jani Honkonen Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.	r668	void PieSliceAnimation::setValue(const PieSliceData &startValue, const PieSliceData &endValue)
Jani Honkonen Add animations to pie. Works but has some visual issues when adding slices.	r618	{
		if (state() != QAbstractAnimation::Stopped)
		stop();

Jani Honkonen Fix add/remove animation for pie and apply colors from theme when adding/removing	r659	m_currentValue = startValue;

Jani Honkonen Add animations to pie. Works but has some visual issues when adding slices.	r618	setKeyValueAt(0.0, qVariantFromValue(startValue));
		setKeyValueAt(1.0, qVariantFromValue(endValue));
		}

Jani Honkonen Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.	r668	void PieSliceAnimation::updateValue(const PieSliceData &endValue)
Jani Honkonen Add animations to pie. Works but has some visual issues when adding slices.	r618	{
		if (state() != QAbstractAnimation::Stopped)
		stop();

Jani Honkonen Fix add/remove animation for pie and apply colors from theme when adding/removing	r659	setKeyValueAt(0.0, qVariantFromValue(m_currentValue));
Jani Honkonen Add animations to pie. Works but has some visual issues when adding slices.	r618	setKeyValueAt(1.0, qVariantFromValue(endValue));
		}

Jani Honkonen Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.	r668	PieSliceData PieSliceAnimation::currentSliceValue()
Jani Honkonen Add animations to pie. Works but has some visual issues when adding slices.	r618	{
Jani Honkonen Fix add/remove animation for pie and apply colors from theme when adding/removing	r659	// NOTE:
		// We must use an internal current value because QVariantAnimation::currentValue() is updated
		// before the animation is actually started. So if we get 2 updateValue() calls in a row the currentValue()
		// will have the end value set from the first call and the second call will interpolate that instead of
		// the original current value as it was before the first call.
		return m_currentValue;
Jani Honkonen Add animations to pie. Works but has some visual issues when adding slices.	r618	}

		QVariant PieSliceAnimation::interpolated(const QVariant &start, const QVariant &end, qreal progress) const
		{
Jani Honkonen Fix deprecation errors from Qt5	r2241	PieSliceData startValue = qvariant_cast<PieSliceData>(start);
		PieSliceData endValue = qvariant_cast<PieSliceData>(end);
Jani Honkonen Add animations to pie. Works but has some visual issues when adding slices.	r618
Jani Honkonen Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.	r668	PieSliceData result;
Jani Honkonen Add animations to pie. Works but has some visual issues when adding slices.	r618	result = endValue;
		result.m_center = linearPos(startValue.m_center, endValue.m_center, progress);
		result.m_radius = linearPos(startValue.m_radius, endValue.m_radius, progress);
		result.m_startAngle = linearPos(startValue.m_startAngle, endValue.m_startAngle, progress);
		result.m_angleSpan = linearPos(startValue.m_angleSpan, endValue.m_angleSpan, progress);
Jani Honkonen Adding PIMPL to pie	r669	result.m_slicePen = linearPos(startValue.m_slicePen, endValue.m_slicePen, progress);
		result.m_sliceBrush = linearPos(startValue.m_sliceBrush, endValue.m_sliceBrush, progress);
Marek Rosa Donut support simplified. Examples updated	r1838	result.m_holeRadius = linearPos(startValue.m_holeRadius, endValue.m_holeRadius, progress);
Jani Honkonen Add animations to pie. Works but has some visual issues when adding slices.	r618
		return qVariantFromValue(result);
		}

		void PieSliceAnimation::updateCurrentValue(const QVariant &value)
		{
Jani Honkonen Fix add/remove animation for pie and apply colors from theme when adding/removing	r659	if (state() != QAbstractAnimation::Stopped) { //workaround
Jani Honkonen Fix deprecation errors from Qt5	r2241	m_currentValue = qvariant_cast<PieSliceData>(value);
Jani Honkonen Refactor graphical side of pie to simplify the implementation.	r1074	m_sliceItem->setLayout(m_currentValue);
Jani Honkonen Fix add/remove animation for pie and apply colors from theme when adding/removing	r659	}
Jani Honkonen Add animations to pie. Works but has some visual issues when adding slices.	r618	}

		QTCOMMERCIALCHART_END_NAMESPACE