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

Remove warnings about unmatched parentheses...

Remove warnings about unmatched parentheses Property declarations divided into several lines caused qmake to warn of cat() function about deprecated unmatched parentheses. The property declarations are now done in one line. Task-number: QTRD-3159 Change-Id: Ieb839ff81d707a5a40cdebd62a52ac32f51517b7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

Titta Heikkala - - Load All Authors

File last commit:

r2688:bdd8266c9c7d


                r2692:d672b074a893

Download file

             baranimation.cpp
        
                    82 lines
            
             | 2.6 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / animations / baranimation.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Jani Honkonen
    
Add license headers

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

      **

        Titta Heikkala
    
Update copyright year...

              r2688
            
      ** Copyright (C) 2014 Digia Plc

        Jani Honkonen
    
Add license headers

              r794
            
      ** 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.

        Jani Honkonen
    
Add license headers

              r794
            
      **

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

        Jani Honkonen
    
Add license headers

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

      **

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

        sauimone
    
Animation framework for barchart.

              r671
            
      #include "baranimation_p.h"

        sauimone
    
refactoring internal barchart items

              r1674
            
      #include "abstractbarchartitem_p.h"

        sauimone
    
Animation framework for barchart.

              r671
            
        sauimone
    
barchart animation mechanics working. still some todo

              r681
            
      Q_DECLARE_METATYPE(QVector<QRectF>)

        sauimone
    
Animation framework for barchart.

              r671
            
      QTCOMMERCIALCHART_BEGIN_NAMESPACE

        sauimone
    
refactoring internal barchart items

              r1674
            
      BarAnimation::BarAnimation(AbstractBarChartItem *item)

        Marek Rosa
    
Bar animations refactored

              r2316
            
          : ChartAnimation(item),

            m_item(item)

        sauimone
    
Animation framework for barchart.

              r671
            
      {

        Marek Rosa
    
Bar animations refactored

              r2316
            
          setDuration(ChartAnimationDuration);

          setEasingCurve(QEasingCurve::OutQuart);

        sauimone
    
Animation framework for barchart.

              r671
            
      }

      BarAnimation::~BarAnimation()

      {

      }

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

      {

        Jani Honkonen
    
Fix deprecation errors from Qt5

              r2241
            
          QVector<QRectF> startVector = qvariant_cast<QVector<QRectF> >(from);

          QVector<QRectF> endVector = qvariant_cast<QVector<QRectF> >(to);

        sauimone
    
barchart animation mechanics working. still some todo

              r681
            
          QVector<QRectF> result;

        sauimone
    
Animation framework for barchart.

              r671
            
        Marek Rosa
    
PieSeries: model now supports custom mapping.

              r1056
            
          Q_ASSERT(startVector.count() == endVector.count());

        sauimone
    
Animation framework for barchart.

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

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

        sauimone
    
correct interpolation for baranimation

              r1879
            
              QRectF start = startVector[i].normalized();

              QRectF end = endVector[i].normalized();

        Marek Rosa
    
Bar animations refactored

              r2316
            
              qreal x1 = start.left() + progress * (end.left() - start.left());

              qreal x2 = start.right() + progress * (end.right() - start.right());

              qreal y1 = start.top() + progress * (end.top() - start.top());

              qreal y2 = start.bottom() + progress * (end.bottom() - start.bottom());

        sauimone
    
correct interpolation for baranimation

              r1879
            
        Marek Rosa
    
Bar animations refactored

              r2316
            
              QRectF value(QPointF(x1, y1), QPointF(x2, y2));

        sauimone
    
fix to baranimations leaving crap on screen with negative bars

              r1824
            
              result << value.normalized();

        sauimone
    
Animation framework for barchart.

              r671
            
          }

          return qVariantFromValue(result);

      }

        Marek Rosa
    
Bar animations refactored

              r2316
            
      void BarAnimation::updateCurrentValue(const QVariant &value)

      {

        Marek Rosa
    
Fixed baranimation blinking

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

              QVector<QRectF> layout = qvariant_cast<QVector<QRectF> >(value);

              m_item->setLayout(layout);

          }

        Marek Rosa
    
Bar animations refactored

              r2316
            
      }

      void BarAnimation::setup(const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout)

      {

          QVariantAnimation::KeyValues value;

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

          setKeyValueAt(0.0, qVariantFromValue(oldLayout));

          setKeyValueAt(1.0, qVariantFromValue(newLayout));

      }

        sauimone
    
Animation framework for barchart.

              r671
            
      #include "moc_baranimation_p.cpp"

      QTCOMMERCIALCHART_END_NAMESPACE

        Marek Rosa
    
Bar animations refactored

              r2316

	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 Update copyright year...	r2688	** Copyright (C) 2014 Digia Plc
Jani Honkonen Add license headers	r794	** 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.
Jani Honkonen Add license headers	r794	**
		** $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
Jani Honkonen Add license headers	r794	** 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$
		**
		****************************************************************************/

sauimone Animation framework for barchart.	r671	#include "baranimation_p.h"
sauimone refactoring internal barchart items	r1674	#include "abstractbarchartitem_p.h"
sauimone Animation framework for barchart.	r671
sauimone barchart animation mechanics working. still some todo	r681	Q_DECLARE_METATYPE(QVector<QRectF>)
sauimone Animation framework for barchart.	r671
		QTCOMMERCIALCHART_BEGIN_NAMESPACE

sauimone refactoring internal barchart items	r1674	BarAnimation::BarAnimation(AbstractBarChartItem *item)
Marek Rosa Bar animations refactored	r2316	: ChartAnimation(item),
		m_item(item)
sauimone Animation framework for barchart.	r671	{
Marek Rosa Bar animations refactored	r2316	setDuration(ChartAnimationDuration);
		setEasingCurve(QEasingCurve::OutQuart);
sauimone Animation framework for barchart.	r671	}

		BarAnimation::~BarAnimation()
		{
		}

		QVariant BarAnimation::interpolated(const QVariant &from, const QVariant &to, qreal progress) const
		{
Jani Honkonen Fix deprecation errors from Qt5	r2241	QVector<QRectF> startVector = qvariant_cast<QVector<QRectF> >(from);
		QVector<QRectF> endVector = qvariant_cast<QVector<QRectF> >(to);
sauimone barchart animation mechanics working. still some todo	r681	QVector<QRectF> result;
sauimone Animation framework for barchart.	r671
Marek Rosa PieSeries: model now supports custom mapping.	r1056	Q_ASSERT(startVector.count() == endVector.count());
sauimone Animation framework for barchart.	r671
Jani Honkonen astyle and manual coding style fixes for src-folder	r2097	for (int i = 0; i < startVector.count(); i++) {
sauimone correct interpolation for baranimation	r1879	QRectF start = startVector[i].normalized();
		QRectF end = endVector[i].normalized();
Marek Rosa Bar animations refactored	r2316	qreal x1 = start.left() + progress * (end.left() - start.left());
		qreal x2 = start.right() + progress * (end.right() - start.right());
		qreal y1 = start.top() + progress * (end.top() - start.top());
		qreal y2 = start.bottom() + progress * (end.bottom() - start.bottom());
sauimone correct interpolation for baranimation	r1879
Marek Rosa Bar animations refactored	r2316	QRectF value(QPointF(x1, y1), QPointF(x2, y2));
sauimone fix to baranimations leaving crap on screen with negative bars	r1824	result << value.normalized();
sauimone Animation framework for barchart.	r671	}
		return qVariantFromValue(result);
		}

Marek Rosa Bar animations refactored	r2316	void BarAnimation::updateCurrentValue(const QVariant &value)
		{
Marek Rosa Fixed baranimation blinking	r2320	if (state() != QAbstractAnimation::Stopped) { //workaround

		QVector<QRectF> layout = qvariant_cast<QVector<QRectF> >(value);
		m_item->setLayout(layout);
		}
Marek Rosa Bar animations refactored	r2316	}

		void BarAnimation::setup(const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout)
		{
		QVariantAnimation::KeyValues value;
		setKeyValues(value); //workaround for wrong interpolation call
		setKeyValueAt(0.0, qVariantFromValue(oldLayout));
		setKeyValueAt(1.0, qVariantFromValue(newLayout));
		}

sauimone Animation framework for barchart.	r671	#include "moc_baranimation_p.cpp"

		QTCOMMERCIALCHART_END_NAMESPACE
Marek Rosa Bar animations refactored	r2316