HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r671:c28ddd8c89e3

Animation framework for barchart.

sauimone -

r671:c28ddd8c89e3

parent child

Context file:

r671:c28ddd8c89e3

Collapse all files

src/animations/baranimation.cpp created 644 +49 0

@@ -0,0 +1,49
	1	#include "baranimation_p.h"
	2	#include "barchartitem_p.h"
	3	#include <QParallelAnimationGroup>
	4	#include <QTimer>
	5
	6	Q_DECLARE_METATYPE(QVector<QSizeF>)
	7
	8	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	9
	10	BarAnimation::BarAnimation(BarChartItem *item)
	11	:ChartAnimation(item),
	12	m_item(item)
	13	{
	14	}
	15
	16	BarAnimation::~BarAnimation()
	17	{
	18	}
	19
	20	void BarAnimation::updateValues(const BarLayout& layout)
	21	{
	22	// TODO:
	23	qDebug() << "BarAnimation::updateValues";
	24	}
	25
	26
	27	QVariant BarAnimation::interpolated(const QVariant &from, const QVariant &to, qreal progress) const
	28	{
	29	QVector<QSizeF> startVector = qVariantValue<QVector<QSizeF> > (from);
	30	QVector<QSizeF> endVector = qVariantValue<QVector<QSizeF> > (to);
	31	QVector<QSizeF> result;
	32
	33	Q_ASSERT(startVector.count() == endVector.count()) ;
	34
	35	for(int i =0 ;i< startVector.count();i++){
	36	QSizeF value = startVector[i] + ((endVector[i]- endVector[i]) * progress);
	37	result << value;
	38	}
	39	return qVariantFromValue(result);
	40	}
	41
	42	void BarAnimation::updateCurrentValue(const QVariant &)
	43	{
	44	// TODO?
	45	}
	46
	47	#include "moc_baranimation_p.cpp"
	48
	49	QTCOMMERCIALCHART_END_NAMESPACE

src/animations/baranimation_p.h created 644 +36 0

@@ -0,0 +1,36
	1	#ifndef BARANIMATION_P_H_
	2	#define BARANIMATION_P_H_
	3
	4	#include "chartanimation_p.h"
	5	#include "barchartitem_p.h"
	6
	7	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	8
	9	class BarChartItem;
	10	class QBarSet;
	11	class BarSetAnimation;
	12
	13	class BarAnimation : public ChartAnimation
	14	{
	15	Q_OBJECT
	16
	17	public:
	18	BarAnimation(BarChartItem *item);
	19	~BarAnimation();
	20
	21	void updateValues(const BarLayout& layout);
	22
	23	public: // from QVariantAnimation
	24	virtual QVariant interpolated (const QVariant & from, const QVariant & to, qreal progress ) const;
	25	virtual void updateCurrentValue (const QVariant & value );
	26
	27	public Q_SLOTS:
	28
	29	private:
	30	BarChartItem *m_item;
	31	QHash<QBarSet, BarSetAnimation> m_animations;
	32	};
	33
	34	QTCOMMERCIALCHART_END_NAMESPACE
	35
	36	#endif

src/animations/animations.pri +6 -2

                 $$PWD/xyanimation.cpp \
                 $$PWD/pieanimation.cpp \
                 $$PWD/piesliceanimation.cpp \
-                $$PWD/splineanimation.cpp
+                $$PWD/splineanimation.cpp \
+                $$PWD/baranimation.cpp
             PRIVATE_HEADERS += \
                 $$PWD/xyanimation_p.h \
                 $$PWD/pieanimation_p.h \
                 $$PWD/piesliceanimation_p.h \
-                $$PWD/splineanimation_p.h
+                $$PWD/splineanimation_p.h \
+                $$PWD/baranimation_p.h

src/animations/chartanimator.cpp +24 0

             #include "splineanimation_p.h"
             #include "xychartitem_p.h"
             #include "pieanimation_p.h"
+            #include "baranimation_p.h"
+            #include "barchartitem_p.h"
             #include "areachartitem_p.h"
             #include "splinechartitem_p.h"
             #include "scatterchartitem_p.h"
                 item->setAnimator(this);
             }
+            void ChartAnimator::addAnimation(BarChartItem* item)
+            {
+                ChartAnimation* animation = m_animations.value(item);
+                if(!animation) {
+                    animation = new BarAnimation(item);
+                    m_animations.insert(item,animation);
+                }
+                item->setAnimator(this);
+            }
             void ChartAnimator::removeAnimation(ChartItem* item)
             {
                 item->setAnimator(0);
                 animation->updateValue(slice, sliceData);
             }
+            void ChartAnimator::updateLayout(BarChartItem* item, const BarLayout &layout)
+            {
+                qDebug() << "ChartAnimator::updateLayout";
+                BarAnimation* animation = static_cast<BarAnimation*>(m_animations.value(item));
+                Q_ASSERT(animation);
+                animation->updateValues(layout);
+            }
             void ChartAnimator::setState(State state,const QPointF& point)
             {
             	m_state=state;

src/animations/chartanimator_p.h +4 0

             #include "qchartglobal.h"
             #include "chartanimation_p.h"
             #include "piechartitem_p.h"
+            #include "barchartitem_p.h"
             #include <QPointF>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 void addAnimation(ScatterChartItem* item);
                 void addAnimation(LineChartItem* item);
                 void addAnimation(SplineChartItem* item);
+                void addAnimation(BarChartItem* item);
                 void removeAnimation(ChartItem* item);
                 void animationStarted();
                 void updateLayout(PieChartItem* item, const PieLayout &layout);
                 void updateLayout(PieChartItem* item, QPieSlice *slice, const PieSliceData &sliceData);
+                void updateLayout(BarChartItem* item, const BarLayout &layout);
                 void setState(State state,const QPointF& point = QPointF());
             private:

src/barchart/barchartitem.cpp +36 0

@@ -7,6 +7,7
7	#include "qchartaxis.h"	7	#include "qchartaxis.h"
8	#include "qchartaxiscategories.h"	8	#include "qchartaxiscategories.h"
9	#include "chartpresenter_p.h"	9	#include "chartpresenter_p.h"
		10	#include "chartanimator_p.h"
10	#include <QDebug>	11	#include <QDebug>
11	#include <QToolTip>	12	#include <QToolTip>
12		13
@@ -22,6 +23,8 BarChartItem::BarChartItem(QBarSeries series, QChart parent) :
22	{	23	{
23	connect(series,SIGNAL(showToolTip(QPoint,QString)),this,SLOT(showToolTip(QPoint,QString)));	24	connect(series,SIGNAL(showToolTip(QPoint,QString)),this,SLOT(showToolTip(QPoint,QString)));
24	connect(series, SIGNAL(updatedBars()), this, SLOT(layoutChanged()));	25	connect(series, SIGNAL(updatedBars()), this, SLOT(layoutChanged()));
		26	//TODO: connect(series,SIGNAL("position or size has changed"), this, SLOT(handleLayoutChanged()));
		27	connect(series, SIGNAL(restructuredBar(int)), this, SLOT(handleModelChanged(int)));
25	setZValue(ChartPresenter::BarSeriesZValue);	28	setZValue(ChartPresenter::BarSeriesZValue);
26	initAxisLabels();	29	initAxisLabels();
27	dataChanged();	30	dataChanged();
@@ -157,6 +160,31 void BarChartItem::layoutChanged()
157	update();	160	update();
158	}	161	}
159		162
		163	BarLayout BarChartItem::calculateLayout()
		164	{
		165	BarLayout layout;
		166	foreach(Bar* bar, mBars) {
		167	layout.insert(bar,bar->boundingRect().size());
		168	}
		169
		170	return layout;
		171	}
		172
		173	void BarChartItem::applyLayout(const BarLayout &layout)
		174	{
		175	if (m_animator)
		176	m_animator->updateLayout(this, layout);
		177	else
		178	setLayout(layout);
		179	}
		180
		181	void BarChartItem::setLayout(const BarLayout &layout)
		182	{
		183	foreach (Bar *bar, layout.keys()) {
		184	bar->setSize(layout.value(bar));
		185	}
		186	update();
		187	}
160		188
161	void BarChartItem::initAxisLabels()	189	void BarChartItem::initAxisLabels()
162	{	190	{
@@ -228,6 +256,14 void BarChartItem::handleGeometryChanged(const QRectF& rect)
228	setPos(rect.topLeft());	256	setPos(rect.topLeft());
229	}	257	}
230		258
		259	void BarChartItem::handleLayoutChanged()
		260	{
		261	BarLayout layout = calculateLayout();
		262	applyLayout(layout);
		263	update();
		264	}
		265
		266
231	void BarChartItem::showToolTip(QPoint pos, QString tip)	267	void BarChartItem::showToolTip(QPoint pos, QString tip)
232	{	268	{
233	// TODO: cool tooltip instead of default	269	// TODO: cool tooltip instead of default

src/barchart/barchartitem_p.h +8 -1

             class QChartAxisCategories;
             class QChart;
-            // Common implemantation of different presenters.
+            typedef QHash<Bar*, QSizeF> BarLayout;
             class BarChartItem : public QObject, public ChartItem
             {
                 Q_OBJECT
             private slots:
                 virtual void layoutChanged();   // layout has changed -> need to recalculate bar sizes
+            public:
+                BarLayout calculateLayout();
+                void applyLayout(const BarLayout &layout);
+                void setLayout(const BarLayout &layout);
             protected:
                 void initAxisLabels();
                 void handleModelChanged(int index);
                 void handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY);
                 void handleGeometryChanged(const QRectF& size);
+                void handleLayoutChanged();
                 // Internal slots
                 void showToolTip(QPoint pos, QString tip);      // shows tooltip (if enabled)

src/chartpresenter.cpp +3 -3

                     QBarSeries* barSeries = static_cast<QBarSeries*>(series);
                     BarChartItem* bar = new BarChartItem(barSeries,m_chart);
                     if(m_options.testFlag(QChart::SeriesAnimations)) {
-                     //  m_animator->addAnimation(bar);
+                        m_animator->addAnimation(bar);
                     }
                     m_chartTheme->decorate(barSeries, m_dataset->seriesIndex(barSeries),m_themeForce);
                     QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),bar,SLOT(handleGeometryChanged(const QRectF&)));
                     QStackedBarSeries* stackedBarSeries = static_cast<QStackedBarSeries*>(series);
                     StackedBarChartItem* bar = new StackedBarChartItem(stackedBarSeries,m_chart);
                     if(m_options.testFlag(QChart::SeriesAnimations)) {
-                     //  m_animator->addAnimation(bar);
+                        m_animator->addAnimation(bar);
                     }
                     m_chartTheme->decorate(stackedBarSeries, m_dataset->seriesIndex(stackedBarSeries),m_themeForce);
                     QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),bar,SLOT(handleGeometryChanged(const QRectF&)));
                     QPercentBarSeries* percentBarSeries = static_cast<QPercentBarSeries*>(series);
                     PercentBarChartItem* bar = new PercentBarChartItem(percentBarSeries,m_chart);
                     if(m_options.testFlag(QChart::SeriesAnimations)) {
-                     //  m_animator->addAnimation(bar);
+                        m_animator->addAnimation(bar);
                     }
                     m_chartTheme->decorate(percentBarSeries, m_dataset->seriesIndex(percentBarSeries),m_themeForce);
                     QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),bar,SLOT(handleGeometryChanged(const QRectF&)));

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