HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1426:9cc71c12c6d0

animations for stacked and percentbarchart

sauimone -

r1426:9cc71c12c6d0

parent child

Context file:

r1426:9cc71c12c6d0

Collapse all files

src/animations/percentbaranimation.cpp created 644 +79 0

@@ -0,0 +1,79
	1	/****************************************************************************
	2	**
	3	** Copyright (C) 2012 Digia Plc
	4	** All rights reserved.
	5	** For any questions to Digia, please use contact form at http://qt.digia.com
	6	**
	7	** This file is part of the Qt Commercial Charts Add-on.
	8	**
	9	** $QT_BEGIN_LICENSE$
	10	** Licensees holding valid Qt Commercial licenses may use this file in
	11	** accordance with the Qt Commercial License Agreement provided with the
	12	** Software or, alternatively, in accordance with the terms contained in
	13	** a written agreement between you and Digia.
	14	**
	15	** If you have questions regarding the use of this file, please use
	16	** contact form at http://qt.digia.com
	17	** $QT_END_LICENSE$
	18	**
	19	****************************************************************************/
	20
	21	#include "percentbaranimation_p.h"
	22	#include "percentbarchartitem_p.h"
	23	#include <QTimer>
	24
	25	Q_DECLARE_METATYPE(QVector<QRectF>)
	26
	27	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	28
	29	PercentBarAnimation::PercentBarAnimation(BarChartItem *item)
	30	:ChartAnimation(item),
	31	m_item(item)
	32	{
	33	setEasingCurve(QEasingCurve::OutQuart);
	34	}
	35
	36	PercentBarAnimation::~PercentBarAnimation()
	37	{
	38	}
	39
	40	QVariant PercentBarAnimation::interpolated(const QVariant &from, const QVariant &to, qreal progress) const
	41	{
	42	QVector<QRectF> startVector = qVariantValue<QVector<QRectF> >(from);
	43	QVector<QRectF> endVector = qVariantValue<QVector<QRectF> >(to);
	44	QVector<QRectF> result;
	45
	46	Q_ASSERT(startVector.count() == endVector.count());
	47
	48	qreal zeroPos = ((m_item->geometry().height() + m_item->geometry().y()) * (1 - progress));
	49
	50	for(int i = 0; i < startVector.count(); i++) {
	51	qreal w = endVector[i].width();
	52	qreal h = startVector[i].height() + ((endVector[i].height() - startVector[i].height()) * progress);
	53	qreal x = endVector[i].topLeft().x();
	54	qreal y = startVector[i].topLeft().y() + ((endVector[i].topLeft().y() - startVector[i].topLeft().y()) * progress)
	55	+ zeroPos;
	56
	57	QRectF value(x,y,w,h);
	58	result << value;
	59	}
	60	return qVariantFromValue(result);
	61	}
	62
	63	void PercentBarAnimation::updateCurrentValue(const QVariant &value)
	64	{
	65	QVector<QRectF> layout = qVariantValue<QVector<QRectF> >(value);
	66	m_item->setLayout(layout);
	67	}
	68
	69	void PercentBarAnimation::updateLayout(const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout)
	70	{
	71	setDuration(ChartAnimationDuration);
	72	setKeyValueAt(0.0, qVariantFromValue(oldLayout));
	73	setKeyValueAt(1.0, qVariantFromValue(newLayout));
	74	QTimer::singleShot(0, this, SLOT(start()));
	75	}
	76
	77	#include "moc_percentbaranimation_p.cpp"
	78
	79	QTCOMMERCIALCHART_END_NAMESPACE

src/animations/percentbaranimation_p.h created 644 +43 0

@@ -0,0 +1,43
	1	// W A R N I N G
	2	// -------------
	3	//
	4	// This file is not part of the QtCommercial Chart API. It exists purely as an
	5	// implementation detail. This header file may change from version to
	6	// version without notice, or even be removed.
	7	//
	8	// We mean it.
	9
	10	#ifndef PERCENTBARANIMATION_P_H
	11	#define PERCENTBARANIMATION_P_H
	12
	13	#include "chartanimation_p.h"
	14	#include "barchartitem_p.h"
	15
	16	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	17
	18	class PercentBarChartItem;
	19	class QBarSet;
	20	class BarSetAnimation;
	21
	22	class PercentBarAnimation : public ChartAnimation
	23	{
	24	Q_OBJECT
	25	public:
	26	PercentBarAnimation(BarChartItem *item);
	27	~PercentBarAnimation();
	28
	29	public:
	30	virtual QVariant interpolated(const QVariant &from, const QVariant &to, qreal progress) const;
	31	virtual void updateCurrentValue(const QVariant &value);
	32
	33	void updateLayout(const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout);
	34
	35	private:
	36	BarChartItem *m_item;
	37	QHash<QBarSet , BarSetAnimation > m_animations;
	38
	39	};
	40
	41	QTCOMMERCIALCHART_END_NAMESPACE
	42
	43	#endif // PERCENTBARANIMATION_P_H

src/animations/stackedbaranimation.cpp created 644 +79 0

@@ -0,0 +1,79
	1	/****************************************************************************
	2	**
	3	** Copyright (C) 2012 Digia Plc
	4	** All rights reserved.
	5	** For any questions to Digia, please use contact form at http://qt.digia.com
	6	**
	7	** This file is part of the Qt Commercial Charts Add-on.
	8	**
	9	** $QT_BEGIN_LICENSE$
	10	** Licensees holding valid Qt Commercial licenses may use this file in
	11	** accordance with the Qt Commercial License Agreement provided with the
	12	** Software or, alternatively, in accordance with the terms contained in
	13	** a written agreement between you and Digia.
	14	**
	15	** If you have questions regarding the use of this file, please use
	16	** contact form at http://qt.digia.com
	17	** $QT_END_LICENSE$
	18	**
	19	****************************************************************************/
	20
	21	#include "stackedbaranimation_p.h"
	22	#include "stackedbarchartitem_p.h"
	23	#include <QTimer>
	24
	25	Q_DECLARE_METATYPE(QVector<QRectF>)
	26
	27	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	28
	29	StackedBarAnimation::StackedBarAnimation(BarChartItem *item)
	30	:ChartAnimation(item),
	31	m_item(item)
	32	{
	33	setEasingCurve(QEasingCurve::OutQuart);
	34	}
	35
	36	StackedBarAnimation::~StackedBarAnimation()
	37	{
	38	}
	39
	40	QVariant StackedBarAnimation::interpolated(const QVariant &from, const QVariant &to, qreal progress) const
	41	{
	42	QVector<QRectF> startVector = qVariantValue<QVector<QRectF> >(from);
	43	QVector<QRectF> endVector = qVariantValue<QVector<QRectF> >(to);
	44	QVector<QRectF> result;
	45
	46	Q_ASSERT(startVector.count() == endVector.count());
	47
	48	qreal zeroPos = ((m_item->geometry().height() + m_item->geometry().y()) * (1 - progress));
	49
	50	for(int i = 0; i < startVector.count(); i++) {
	51	qreal w = endVector[i].width();
	52	qreal h = startVector[i].height() + ((endVector[i].height() - startVector[i].height()) * progress);
	53	qreal x = endVector[i].topLeft().x();
	54	qreal y = startVector[i].topLeft().y() + ((endVector[i].topLeft().y() - startVector[i].topLeft().y()) * progress)
	55	+ zeroPos;
	56
	57	QRectF value(x,y,w,h);
	58	result << value;
	59	}
	60	return qVariantFromValue(result);
	61	}
	62
	63	void StackedBarAnimation::updateCurrentValue(const QVariant &value)
	64	{
	65	QVector<QRectF> layout = qVariantValue<QVector<QRectF> >(value);
	66	m_item->setLayout(layout);
	67	}
	68
	69
	70	void StackedBarAnimation::updateLayout(const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout)
	71	{
	72	setDuration(ChartAnimationDuration);
	73	setKeyValueAt(0.0, qVariantFromValue(oldLayout));
	74	setKeyValueAt(1.0, qVariantFromValue(newLayout));
	75	QTimer::singleShot(0, this, SLOT(start()));
	76	}
	77	#include "moc_stackedbaranimation_p.cpp"
	78
	79	QTCOMMERCIALCHART_END_NAMESPACE

src/animations/stackedbaranimation_p.h created 644 +43 0

@@ -0,0 +1,43
	1	// W A R N I N G
	2	// -------------
	3	//
	4	// This file is not part of the QtCommercial Chart API. It exists purely as an
	5	// implementation detail. This header file may change from version to
	6	// version without notice, or even be removed.
	7	//
	8	// We mean it.
	9
	10	#ifndef STACKEDBARANIMATION_P_H
	11	#define STACKEDBARANIMATION_P_H
	12
	13	#include "chartanimation_p.h"
	14	#include "barchartitem_p.h"
	15
	16	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	17
	18	class StackedBarChartItem;
	19	class QBarSet;
	20	class BarSetAnimation;
	21
	22	class StackedBarAnimation : public ChartAnimation
	23	{
	24	Q_OBJECT
	25	public:
	26	StackedBarAnimation(BarChartItem *item);
	27	~StackedBarAnimation();
	28
	29	public:
	30	virtual QVariant interpolated(const QVariant &from, const QVariant &to, qreal progress) const;
	31	virtual void updateCurrentValue(const QVariant &value);
	32
	33	void updateLayout(const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout);
	34
	35	private:
	36	BarChartItem *m_item;
	37	QHash<QBarSet , BarSetAnimation > m_animations;
	38
	39	};
	40
	41	QTCOMMERCIALCHART_END_NAMESPACE
	42
	43	#endif // STACKEDBARANIMATION_P_H

src/animations/animations.pri +6 -3

             INCLUDEPATH += $$PWD
             DEPENDPATH += $$PWD
             SOURCES += \
                 $$PWD/axisanimation.cpp \
                 $$PWD/chartanimator.cpp \
                 $$PWD/xyanimation.cpp \
                 $$PWD/pieanimation.cpp \
                 $$PWD/piesliceanimation.cpp \
                 $$PWD/splineanimation.cpp \
-                $$PWD/baranimation.cpp
+                $$PWD/baranimation.cpp \
+                $$PWD/stackedbaranimation.cpp \
+                $$PWD/percentbaranimation.cpp
             PRIVATE_HEADERS += \
                 $$PWD/axisanimation_p.h \
                 $$PWD/chartanimator_p.h \
                 $$PWD/chartanimation_p.h \
                 $$PWD/xyanimation_p.h \
                 $$PWD/pieanimation_p.h \
                 $$PWD/piesliceanimation_p.h \
                 $$PWD/splineanimation_p.h \
-                $$PWD/baranimation_p.h
+                $$PWD/baranimation_p.h \
+                $$PWD/stackedbaranimation_p.h \
+                $$PWD/percentbaranimation_p.h

src/animations/baranimation.cpp +10 -6

             /****************************************************************************
             **
             ** 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$
             **
             ****************************************************************************/
             #include "baranimation_p.h"
             #include "barchartitem_p.h"
-            #include <QParallelAnimationGroup>
             #include <QTimer>
             Q_DECLARE_METATYPE(QVector<QRectF>)
-            //Q_DECLARE_METATYPE(BarLayout)     // TODO?
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             BarAnimation::BarAnimation(BarChartItem *item)
                 :ChartAnimation(item),
                 m_item(item)
             {
+                setEasingCurve(QEasingCurve::OutQuart);
             }
             BarAnimation::~BarAnimation()
             {
             }
             QVariant BarAnimation::interpolated(const QVariant &from, const QVariant &to, qreal progress) const
             {
                 QVector<QRectF> startVector = qVariantValue<QVector<QRectF> >(from);
                 QVector<QRectF> endVector = qVariantValue<QVector<QRectF> >(to);
                 QVector<QRectF> result;
                 Q_ASSERT(startVector.count() == endVector.count());
                 for(int i = 0; i < startVector.count(); i++) {
                     qreal w = endVector[i].width();
                     qreal h = startVector[i].height() + ((endVector[i].height() - startVector[i].height()) * progress);
                     qreal x = endVector[i].topLeft().x();
                     qreal y = endVector[i].topLeft().y() + endVector[i].height() - h;
-                    QPointF topLeft(x,y);
+                    QRectF value(x,y,w,h);
-                    QSizeF size(w,h);
-                    QRectF value(topLeft,size);
                     result << value;
                 }
                 return qVariantFromValue(result);
             }
             void BarAnimation::updateCurrentValue(const QVariant &value)
             {
                 QVector<QRectF> layout = qVariantValue<QVector<QRectF> >(value);
                 m_item->setLayout(layout);
             }
+            void BarAnimation::updateLayout(const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout)
+            {
+                setDuration(ChartAnimationDuration);
+                setKeyValueAt(0.0, qVariantFromValue(oldLayout));
+                setKeyValueAt(1.0, qVariantFromValue(newLayout));
+                QTimer::singleShot(0, this, SLOT(start()));
+            }
             #include "moc_baranimation_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/animations/baranimation_p.h +1 -2

             /****************************************************************************
             **
             ** 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$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef BARANIMATION_P_H
             #define BARANIMATION_P_H
             #include "chartanimation_p.h"
             #include "barchartitem_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class BarChartItem;
             class QBarSet;
             class BarSetAnimation;
             class BarAnimation : public ChartAnimation
             {
                 Q_OBJECT
             public:
                 BarAnimation(BarChartItem *item);
                 ~BarAnimation();
             public: // from QVariantAnimation
                 virtual QVariant interpolated(const QVariant &from, const QVariant &to, qreal progress) const;
                 virtual void updateCurrentValue(const QVariant &value);
-            public Q_SLOTS:
+                void updateLayout(const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout);
             private:
                 BarChartItem *m_item;
-                QHash<QBarSet *, BarSetAnimation *> m_animations;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/animations/chartanimator.cpp +56 -6

             /****************************************************************************
             **
             ** 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$
             **
             ****************************************************************************/
             #include "chartanimator_p.h"
             #include "axisanimation_p.h"
             #include "xyanimation_p.h"
             #include "splineanimation_p.h"
             #include "xychart_p.h"
             #include "pieanimation_p.h"
             #include "baranimation_p.h"
             #include "barchartitem_p.h"
+            #include "stackedbaranimation_p.h"
+            #include "stackedbarchartitem_p.h"
+            #include "percentbaranimation_p.h"
+            #include "percentbarchartitem_p.h"
             #include "areachartitem_p.h"
             #include "splinechartitem_p.h"
             #include "scatterchartitem_p.h"
             #include "chartaxis_p.h"
             #include <QTimer>
             Q_DECLARE_METATYPE(QVector<QPointF>)
             Q_DECLARE_METATYPE(QVector<qreal>)
             Q_DECLARE_METATYPE(QVector<QRectF>)
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ChartAnimator::ChartAnimator(QObject *parent):QObject(parent)
             {
             }
             ChartAnimator::~ChartAnimator()
             {
             }
             void ChartAnimator::addAnimation(PieChartItem *item)
             {
                 ChartAnimation *animation = m_animations.value(item);
                 if (!animation) {
                     animation = new PieAnimation(item);
                     m_animations.insert(item, animation);
                 }
                 item->setAnimator(this);
             }
             void ChartAnimator::addAnimation(BarChartItem *item)
             {
+                // This can handle also GroupedBarChartItem because bars are side by side
                 ChartAnimation *animation = m_animations.value(item);
                 if (!animation) {
                     animation = new BarAnimation(item);
                     m_animations.insert(item, animation);
                 }
                 item->setAnimator(this);
             }
+            void ChartAnimator::addAnimation(StackedBarChartItem *item)
+            {
+                ChartAnimation *animation = m_animations.value(item);
+                if (!animation) {
+                    animation = new StackedBarAnimation(item);
+                    m_animations.insert(item, animation);
+                }
+                item->setAnimator(this);
+            }
+            void ChartAnimator::addAnimation(PercentBarChartItem *item)
+            {
+                ChartAnimation *animation = m_animations.value(item);
+                if (!animation) {
+                    animation = new PercentBarAnimation(item);
+                    m_animations.insert(item, animation);
+                }
+                item->setAnimator(this);
+            }
             void ChartAnimator::removeAnimation(Chart *item)
             {
                 item->setAnimator(0);
                 m_animations.remove(item);
             }
             void ChartAnimator::addAnimation(PieChartItem *item, PieSliceItem *sliceItem, const PieSliceData &sliceData, bool startupAnimation)
             {
                 PieAnimation *animation = static_cast<PieAnimation *>(m_animations.value(item));
                 Q_ASSERT(animation);
                 animation->addSlice(sliceItem, sliceData, startupAnimation);
             }
             void ChartAnimator::removeAnimation(PieChartItem *item, PieSliceItem *sliceItem)
             {
                 PieAnimation *animation = static_cast<PieAnimation *>(m_animations.value(item));
                 Q_ASSERT(animation);
                 animation->removeSlice(sliceItem);
             }
             void ChartAnimator::updateAnimation(PieChartItem *item, PieSliceItem *sliceItem, const PieSliceData &sliceData)
             {
                 PieAnimation *animation = static_cast<PieAnimation *>(m_animations.value(item));
                 Q_ASSERT(animation);
                 animation->updateValue(sliceItem, sliceData);
             }
             void ChartAnimator::updateLayout(BarChartItem *item, const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout)
             {
                 BarAnimation *animation = static_cast<BarAnimation *>(m_animations.value(item));
-                m_animations.remove(item);
                 if (animation) {
+                    m_animations.remove(item);
                     animation->deleteLater();
                     animation = 0;
                     addAnimation(item);
+                }
                 animation = static_cast<BarAnimation *>(m_animations.value(item));
-                animation->setDuration(ChartAnimationDuration);
+                animation->updateLayout(oldLayout,newLayout);
-                animation->setKeyValueAt(0.0, qVariantFromValue(oldLayout));
-                animation->setKeyValueAt(1.0, qVariantFromValue(newLayout));
-                QTimer::singleShot(0, animation, SLOT(start()));
+            void ChartAnimator::updateLayout(StackedBarChartItem *item, const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout)
+            {
+                StackedBarAnimation *animation = static_cast<StackedBarAnimation *>(m_animations.value(item));
+                if (animation) {
+                    m_animations.remove(item);
+                    animation->deleteLater();
+                    animation = 0;
+                    addAnimation(item);
+                }
+                animation = static_cast<StackedBarAnimation *>(m_animations.value(item));
+                animation->updateLayout(oldLayout,newLayout);
             }
+            void ChartAnimator::updateLayout(PercentBarChartItem *item, const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout)
+            {
+                PercentBarAnimation *animation = static_cast<PercentBarAnimation *>(m_animations.value(item));
+                if (animation) {
+                    m_animations.remove(item);
+                    animation->deleteLater();
+                    animation = 0;
+                    addAnimation(item);
+                }
+                animation = static_cast<PercentBarAnimation *>(m_animations.value(item));
+                animation->updateLayout(oldLayout,newLayout);
+            }
             #include "moc_chartanimator_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/animations/chartanimator_p.h +5 -1

             /****************************************************************************
             **
             ** 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$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef CHARTANIMATOR_P_H
             #define CHARTANIMATOR_P_H
             #include "qchartglobal.h"
             #include "chartanimation_p.h"
             #include "piechartitem_p.h"
             #include "barchartitem_p.h"
             #include <QPointF>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartItem;
             class ChartAxis;
             class AreaChartItem;
             class SplineChartItem;
             class ScatterChartItem;
             class LineChartItem;
             class XYChartItem;
             class XYAnimation;
             class ChartAnimator : public QObject
             {
                 Q_OBJECT
             public:
                 ChartAnimator(QObject *parent = 0);
                 virtual ~ChartAnimator();
                 void addAnimation(PieChartItem *item);
-                void addAnimation(BarChartItem *item);
+                void addAnimation(BarChartItem *item);          // This can handle also grouped bar chart.
+                void addAnimation(StackedBarChartItem *item);
+                void addAnimation(PercentBarChartItem *item);
                 void removeAnimation(Chart *item);
                 void addAnimation(PieChartItem *item, PieSliceItem *sliceItem, const PieSliceData &sliceData, bool isEmpty);
                 void removeAnimation(PieChartItem *item, PieSliceItem *sliceItem);
                 void updateAnimation(PieChartItem *item, PieSliceItem *sliceItem, const PieSliceData &sliceData);
                 void updateLayout(BarChartItem *item, const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout);
+                void updateLayout(StackedBarChartItem *item, const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout);
+                void updateLayout(PercentBarChartItem *item, const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout);
             private:
                  QMap<Chart *, ChartAnimation *> m_animations;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/barchart/bar.cpp 0 -1

             /****************************************************************************
             **
             ** 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$
             **
             ****************************************************************************/
             #include "bar_p.h"
-            #include <QDebug>
             #include <QPainter>
             #include <QGraphicsSceneEvent>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             Bar::Bar(QBarSet *barset, int index, QGraphicsItem *parent) : QGraphicsRectItem(parent),
                 m_index(index),
                 m_barset(barset)
             {
                 setAcceptedMouseButtons(Qt::LeftButton | Qt::RightButton);
                 setAcceptHoverEvents(true);
             }
             void Bar::mousePressEvent(QGraphicsSceneMouseEvent *event)
             {
                 Q_UNUSED(event)
                 emit clicked(m_barset, m_index);
             }
             void Bar::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
             {
                 Q_UNUSED(event)
                 emit hovered(m_barset, true);
             }
             void Bar::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
             {
                 Q_UNUSED(event)
                 emit hovered(m_barset, false);
             }
             #include "moc_bar_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/barchartitem_p.h +1 -1

             /****************************************************************************
             **
             ** 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$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef BARCHARTITEM_H
             #define BARCHARTITEM_H
             #include "chartitem_p.h"
             #include "qbarseries.h"
             #include <QPen>
             #include <QBrush>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class Bar;
             class QAxisCategories;
             class QChart;
             class BarChartItem : public ChartItem
             {
                 Q_OBJECT
             public:
                 BarChartItem(QBarSeries *series, ChartPresenter *presenter);
                 virtual ~BarChartItem();
             public:
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
                 QRectF boundingRect() const;
                 virtual QVector<QRectF> calculateLayout();
-                void applyLayout(const QVector<QRectF> &layout);
+                virtual void applyLayout(const QVector<QRectF> &layout);
                 void setLayout(const QVector<QRectF> &layout);
                 void updateLayout(const QVector<QRectF> &layout);
                 QRectF geometry() const { return m_rect;}
             public Q_SLOTS:
                 void handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY);
                 void handleGeometryChanged(const QRectF &size);
                 void handleLayoutChanged();
                 void handleLabelsVisibleChanged(bool visible);
                 void handleDataStructureChanged();     // structure of of series has changed, recreate graphic items
             protected:
                 qreal m_domainMinX;
                 qreal m_domainMaxX;
                 qreal m_domainMinY;
                 qreal m_domainMaxY;
                 QRectF m_rect;
                 QVector<QRectF> m_layout;
                 // Not owned.
                 QBarSeries *m_series;
                 QList<Bar *> m_bars;
                 QList<QGraphicsSimpleTextItem *> m_labels;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // BARCHARTITEM_H

src/barchart/percentbarchartitem.cpp +10 -1

             /****************************************************************************
             **
             ** 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$
             **
             ****************************************************************************/
             #include "percentbarchartitem_p.h"
             #include "bar_p.h"
             #include "qbarseries_p.h"
             #include "qbarset.h"
-            #include <QDebug>
+            #include "chartanimator_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             PercentBarChartItem::PercentBarChartItem(QBarSeries *series, ChartPresenter *presenter) :
                 BarChartItem(series, presenter)
             {
             }
             QVector<QRectF> PercentBarChartItem::calculateLayout()
             {
                 QVector<QRectF> layout;
                 // Use temporary qreals for accuracy
                 qreal categoryCount = m_series->d_func()->categoryCount();
                 qreal setCount = m_series->barsetCount();
                 bool barsVisible = m_series->isVisible();
                 // Domain:
                 qreal width = geometry().width();
                 qreal height = geometry().height();
                 qreal rangeY = m_domainMaxY - m_domainMinY;
                 qreal rangeX = m_domainMaxX - m_domainMinX;
                 qreal scaleY = (height / rangeY);
                 qreal scaleX = (width / rangeX);
                 qreal barWidth = scaleX * m_series->d_func()->barWidth();
                 int itemIndex(0);
                 for (int category = 0; category < categoryCount; category++) {
                     qreal colSum = m_series->d_func()->categorySum(category);
                     qreal percentage = (100 / colSum);
                     qreal yPos = height + scaleY * m_domainMinY + geometry().topLeft().y();
                     for (int set=0; set < setCount; set++) {
                         QBarSet* barSet = m_series->d_func()->barsetAt(set);
                         qreal xPos = (barSet->at(category).x() - m_domainMinX) * scaleX + m_rect.left() - barWidth/2;
                         qreal barHeight = barSet->at(category).y() * percentage * scaleY;
                         Bar* bar = m_bars.at(itemIndex);
                         bar->setPen(barSet->pen());
                         bar->setBrush(barSet->brush());
                         bar->setVisible(barsVisible);
                         QRectF rect(xPos, yPos-barHeight, barWidth, barHeight);
                         layout.append(rect);
                         QGraphicsSimpleTextItem* label = m_labels.at(itemIndex);
                         if (!qFuzzyIsNull(m_series->d_func()->valueAt(set,category))) {
                             int p = m_series->d_func()->percentageAt(set,category) * 100;
                             QString vString(QString::number(p));
                             vString.truncate(3);
                             vString.append("%");
                             label->setText(vString);
                         } else {
                             label->setText(QString(""));
                         }
                         label->setPos(xPos + (rect.width()/2 - label->boundingRect().width()/2)
                                       ,yPos - barHeight/2 - label->boundingRect().height()/2);
                         label->setFont(barSet->labelFont());
                         label->setBrush(barSet->labelBrush());
                         itemIndex++;
                         yPos -= barHeight;
                     }
                 }
                 return layout;
             }
+            void PercentBarChartItem::applyLayout(const QVector<QRectF> &layout)
+            {
+                if (animator()) {
+                    animator()->updateLayout(this, m_layout, layout);
+                } else {
+                    setLayout(layout);
+                    update();
+                }
+            }
             #include "moc_percentbarchartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/percentbarchartitem_p.h +1 0

             /****************************************************************************
             **
             ** 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$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef PERCENTBARCHARTITEM_H
             #define PERCENTBARCHARTITEM_H
             #include "barchartitem_p.h"
             #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QBarSeries;
             class PercentBarChartItem : public BarChartItem
             {
                 Q_OBJECT
             public:
                 PercentBarChartItem(QBarSeries *series, ChartPresenter *presenter);
             private:
                 virtual QVector<QRectF> calculateLayout();
+                virtual void applyLayout(const QVector<QRectF> &layout);
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // PERCENTBARCHARTITEM_H

src/barchart/stackedbarchartitem.cpp +11 0

             /****************************************************************************
             **
             ** 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$
             **
             ****************************************************************************/
             #include "stackedbarchartitem_p.h"
             #include "bar_p.h"
             #include "qbarset_p.h"
             #include "qbarseries_p.h"
             #include "qbarset.h"
+            #include "chartanimator_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             StackedBarChartItem::StackedBarChartItem(QBarSeries *series, ChartPresenter *presenter) :
                 BarChartItem(series, presenter)
             {
             }
             QVector<QRectF> StackedBarChartItem::calculateLayout()
             {
                 QVector<QRectF> layout;
                 // Use temporary qreals for accuracy
                 qreal categoryCount = m_series->d_func()->categoryCount();
                 qreal setCount = m_series->barsetCount();
                 bool barsVisible = m_series->isVisible();
                 // Domain:
                 qreal width = geometry().width();
                 qreal height = geometry().height();
                 qreal rangeY = m_domainMaxY - m_domainMinY;
                 qreal rangeX = m_domainMaxX - m_domainMinX;
                 qreal scaleY = (height / rangeY);
                 qreal scaleX = (width / rangeX);
                 qreal barWidth = scaleX * m_series->d_func()->barWidth();
                 int itemIndex(0);
                 for (int category = 0; category < categoryCount; category++) {
                     qreal yPos = height + rangeY * m_domainMinY + geometry().topLeft().y();
                     for (int set=0; set < setCount; set++) {
                         QBarSet* barSet = m_series->d_func()->barsetAt(set);
                         qreal xPos = (barSet->at(category).x() - m_domainMinX) * scaleX + m_rect.left() - barWidth/2;
                         qreal barHeight = barSet->at(category).y() * scaleY;
                         Bar* bar = m_bars.at(itemIndex);
                         bar->setPen(barSet->pen());
                         bar->setBrush(barSet->brush());
                         bar->setVisible(barsVisible);
                         QRectF rect(xPos, yPos-barHeight, barWidth, barHeight);
                         layout.append(rect);
                         QGraphicsSimpleTextItem* label = m_labels.at(itemIndex);
                         if (!qFuzzyIsNull(barSet->at(category).y())) {
                             label->setText(QString::number(barSet->at(category).y()));
                         } else {
                             label->setText(QString(""));
                         }
                         label->setPos(xPos + (rect.width()/2 - label->boundingRect().width()/2)
                                       ,yPos - barHeight/2 - label->boundingRect().height()/2);
                         label->setFont(barSet->labelFont());
                         label->setBrush(barSet->labelBrush());
                         itemIndex++;
                         yPos -= barHeight;
                     }
                 }
                 return layout;
             }
+            void StackedBarChartItem::applyLayout(const QVector<QRectF> &layout)
+            {
+                if (animator()) {
+                    animator()->updateLayout(this, m_layout, layout);
+                } else {
+                    setLayout(layout);
+                    update();
+                }
+            }
             #include "moc_stackedbarchartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/stackedbarchartitem_p.h +1 0

             /****************************************************************************
             **
             ** 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$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef STACKEDBARCHARTITEM_H
             #define STACKEDBARCHARTITEM_H
             #include "barchartitem_p.h"
             #include "qstackedbarseries.h"
             #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class StackedBarChartItem : public BarChartItem
             {
                 Q_OBJECT
             public:
                 StackedBarChartItem(QBarSeries *series, ChartPresenter *presenter);
             private:
                 virtual QVector<QRectF> calculateLayout();
+                virtual void applyLayout(const QVector<QRectF> &layout);
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // STACKEDBARCHARTITEM_H

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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