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

Merge remote-tracking branch 'origin/5.6' into 5.7...

Merge remote-tracking branch 'origin/5.6' into 5.7 Conflicts: .qmake.conf README src/charts/qchartglobal.h Change-Id: I20497b20947f589f9f73239a09ba6ea013b3597a

Miikka Heikkinen - - Load All Authors

File last commit:

r2854:46147b040d06


                r2878:97bb01ce5d85

Download file

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

        Miikka Heikkinen
    
Updated license...

              r2854
            
      /****************************************************************************

        Jani Honkonen
    
Add license headers

              r794
            
      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ** Copyright (C) 2016 The Qt Company Ltd.

      ** Contact: https://www.qt.io/licensing/

        Jani Honkonen
    
Add license headers

              r794
            
      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ** This file is part of the Qt Charts module of the Qt Toolkit.

        Jani Honkonen
    
Add license headers

              r794
            
      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ** $QT_BEGIN_LICENSE:GPL$

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** Commercial License Usage

      ** Licensees holding valid commercial Qt licenses may use this file in

      ** accordance with the commercial license agreement provided with the

      ** Software or, alternatively, in accordance with the terms contained in

      ** a written agreement between you and The Qt Company. For licensing terms

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ** and conditions see https://www.qt.io/terms-conditions. For further

      ** information use the contact form at https://www.qt.io/contact-us.

      **

      ** GNU General Public License Usage

      ** Alternatively, this file may be used under the terms of the GNU

      ** General Public License version 3 or (at your option) any later version

      ** approved by the KDE Free Qt Foundation. The licenses are as published by

      ** the Free Software Foundation and appearing in the file LICENSE.GPL3

      ** included in the packaging of this file. Please review the following

      ** information to ensure the GNU General Public License requirements will

      ** be met: https://www.gnu.org/licenses/gpl-3.0.html.

        Jani Honkonen
    
Add license headers

              r794
            
      **

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** $QT_END_LICENSE$

      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ****************************************************************************/

        Jani Honkonen
    
Add license headers

              r794
            
        Titta Heikkala
    
Fix include syntax...

              r2714
            
      #include <private/baranimation_p.h>

      #include <private/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
            
        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QT_CHARTS_BEGIN_NAMESPACE

        sauimone
    
Animation framework for barchart.

              r671
            
        Titta Heikkala
    
Added possibility to set duration and easing curve for chart animation...

              r2804
            
      BarAnimation::BarAnimation(AbstractBarChartItem *item, int duration, QEasingCurve &curve)

        Marek Rosa
    
Bar animations refactored

              r2316
            
          : ChartAnimation(item),

            m_item(item)

        sauimone
    
Animation framework for barchart.

              r671
            
      {

        Titta Heikkala
    
Added possibility to set duration and easing curve for chart animation...

              r2804
            
          setDuration(duration);

          setEasingCurve(curve);

        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"

        Titta Heikkala
    
Qt Charts project file structure change...

              r2712
            
      QT_CHARTS_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

Miikka Heikkinen Updated license...	r2854	/****************************************************************************
Jani Honkonen Add license headers	r794	**
Miikka Heikkinen Updated license...	r2854	** Copyright (C) 2016 The Qt Company Ltd.
		** Contact: https://www.qt.io/licensing/
Jani Honkonen Add license headers	r794	**
Miikka Heikkinen Updated license...	r2854	** This file is part of the Qt Charts module of the Qt Toolkit.
Jani Honkonen Add license headers	r794	**
Miikka Heikkinen Updated license...	r2854	** $QT_BEGIN_LICENSE:GPL$
Titta Heikkala Updated license headers...	r2845	** Commercial License Usage
		** Licensees holding valid commercial Qt licenses may use this file in
		** accordance with the commercial license agreement provided with the
		** Software or, alternatively, in accordance with the terms contained in
		** a written agreement between you and The Qt Company. For licensing terms
Miikka Heikkinen Updated license...	r2854	** and conditions see https://www.qt.io/terms-conditions. For further
		** information use the contact form at https://www.qt.io/contact-us.
		**
		** GNU General Public License Usage
		** Alternatively, this file may be used under the terms of the GNU
		** General Public License version 3 or (at your option) any later version
		** approved by the KDE Free Qt Foundation. The licenses are as published by
		** the Free Software Foundation and appearing in the file LICENSE.GPL3
		** included in the packaging of this file. Please review the following
		** information to ensure the GNU General Public License requirements will
		** be met: https://www.gnu.org/licenses/gpl-3.0.html.
Jani Honkonen Add license headers	r794	**
Titta Heikkala Updated license headers...	r2845	** $QT_END_LICENSE$
		**
Miikka Heikkinen Updated license...	r2854	****************************************************************************/
Jani Honkonen Add license headers	r794
Titta Heikkala Fix include syntax...	r2714	#include <private/baranimation_p.h>
		#include <private/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
Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_BEGIN_NAMESPACE
sauimone Animation framework for barchart.	r671
Titta Heikkala Added possibility to set duration and easing curve for chart animation...	r2804	BarAnimation::BarAnimation(AbstractBarChartItem *item, int duration, QEasingCurve &curve)
Marek Rosa Bar animations refactored	r2316	: ChartAnimation(item),
		m_item(item)
sauimone Animation framework for barchart.	r671	{
Titta Heikkala Added possibility to set duration and easing curve for chart animation...	r2804	setDuration(duration);
		setEasingCurve(curve);
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"

Titta Heikkala Qt Charts project file structure change...	r2712	QT_CHARTS_END_NAMESPACE
Marek Rosa Bar animations refactored	r2316