HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r476:b6fb05e4e56f

Refactor animation to fit line,spline,scatter...

Michal Klocek -

r476:b6fb05e4e56f

parent child

Context file:

r476:b6fb05e4e56f

Expand all files

src/xychart/xychartanimationitem_p.h created 644 +100 0

@@ -0,0 +1,100
	1	#ifndef XYCHARTANIMATIONITEM_P_H_
	2	#define XYCHARTANIMATIONITEM_P_H_
	3	#include "qchartglobal.h"
	4	#include "xychartanimator_p.h"
	5	#include <QPointF>
	6	#include <QTimer>
	7	#include <QGraphicsItem>
	8
	9	Q_DECLARE_METATYPE(QVector<QPointF>)
	10
	11	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	12
	13
	14	const static int duration = 1000;
	15
	16	template <class T , class U>
	17	class XYChartAnimationItem : public T {
	18
	19	public:
	20	XYChartAnimationItem(U series, QGraphicsItem parent = 0);
	21	virtual ~XYChartAnimationItem();
	22
	23	void animationStarted();
	24
	25	protected:
	26	virtual void updatePoints(QVector<QPointF>& newPoints);
	27	virtual void updatePoint(QVector<QPointF>& newPoints);
	28
	29	private:
	30	XYChartAnimator<T,U> *m_animation;
	31	QVector<QPointF> m_points;
	32	bool m_dirty;
	33	};
	34
	35	template <class T, class U>
	36	XYChartAnimationItem<T,U>::XYChartAnimationItem(U series,QGraphicsItem parent):
	37	T(series,parent),
	38	m_animation(new XYChartAnimator<T,U>(this,this)),
	39	m_dirty(false)
	40	{
	41	}
	42
	43	template <class T, class U>
	44	XYChartAnimationItem<T,U>::~XYChartAnimationItem()
	45	{
	46	}
	47
	48	template <class T, class U>
	49	void XYChartAnimationItem<T,U>::updatePoints(QVector<QPointF>& newPoints)
	50	{
	51	QVector<QPointF> oldPoints = T::points();
	52
	53	if(newPoints.count()==0) return;
	54	oldPoints.resize(newPoints.size());
	55
	56	if(m_animation->state()!=QAbstractAnimation::Stopped){
	57	m_animation->stop();
	58	}
	59
	60	m_animation->setDuration(duration);
	61	m_animation->setEasingCurve(QEasingCurve::InOutBack);
	62	m_animation->setKeyValueAt(0.0, qVariantFromValue(oldPoints));
	63	m_animation->setKeyValueAt(1.0, qVariantFromValue(newPoints));
	64	QTimer::singleShot(0,m_animation,SLOT(start()));
	65
	66	m_points = newPoints;
	67	m_dirty=false;
	68	}
	69
	70	template <class T, class U>
	71	void XYChartAnimationItem<T,U>::updatePoint(QVector<QPointF>& newPoints)
	72	{
	73
	74	if(m_animation->state()!=QAbstractAnimation::Stopped) {
	75	m_animation->stop();
	76	m_dirty=true;
	77	}
	78
	79	if(m_dirty) {
	80	m_points=newPoints;
	81	m_dirty=false;
	82	}
	83
	84	m_animation->setDuration(duration);
	85	m_animation->setEasingCurve(QEasingCurve::InOutBack);
	86	m_animation->setKeyValueAt(0.0, qVariantFromValue(m_points));
	87	m_animation->setKeyValueAt(1.0, qVariantFromValue(newPoints));
	88
	89	QTimer::singleShot(0,m_animation,SLOT(start()));
	90	}
	91
	92	template <class T, class U>
	93	void XYChartAnimationItem<T,U>::animationStarted()
	94	{
	95	m_dirty=true;
	96	}
	97
	98	QTCOMMERCIALCHART_END_NAMESPACE
	99
	100	#endif

src/xychart/xychartanimator_p.h created 644 +96 0

@@ -0,0 +1,96
	1	#ifndef XYCHARTANIMATOR_P_H_
	2	#define XYCHARTANIMATOR_P_H_
	3	#include "qchartglobal.h"
	4	#include <QVariantAnimation>
	5	#include <QPointF>
	6
	7	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	8
	9	template <class T, class U>
	10	class XYChartAnimationItem;
	11
	12
	13	template <class T, class U>
	14	class XYChartAnimator : public QVariantAnimation
	15	{
	16	public:
	17	enum Animation { LineDrawAnimation, MoveDownAnimation, MoveUpAnimation };
	18	XYChartAnimator(XYChartAnimationItem<T,U> item, QObject parent = 0 );
	19	~XYChartAnimator();
	20
	21	protected:
	22	QVariant interpolated(const QVariant &start, const QVariant & end, qreal progress ) const;
	23	void updateCurrentValue (const QVariant & value );
	24	void updateState ( QAbstractAnimation::State newState, QAbstractAnimation::State oldState);
	25
	26	private:
	27	XYChartAnimationItem<T,U> *m_item;
	28	Animation m_type;
	29	};
	30
	31	template <class T, class U>
	32	XYChartAnimator<T,U>::XYChartAnimator(XYChartAnimationItem<T,U> item , QObject parent):QVariantAnimation(parent),
	33	m_item(item),
	34	m_type(MoveDownAnimation)
	35	{
	36	}
	37
	38	template <class T,class U>
	39	XYChartAnimator<T,U>::~XYChartAnimator()
	40	{
	41	}
	42
	43	template <class T, class U>
	44	QVariant XYChartAnimator<T,U>::interpolated(const QVariant &start, const QVariant & end, qreal progress ) const
	45	{
	46	QVector<QPointF> startVector = qVariantValue<QVector<QPointF> >(start);
	47	QVector<QPointF> endVector = qVariantValue<QVector<QPointF> >(end);
	48	QVector<QPointF> result;
	49
	50	switch(m_type) {
	51
	52	case MoveDownAnimation: {
	53
	54	Q_ASSERT(startVector.count() == endVector.count());
	55	for(int i =0;i< startVector.count();i++) {
	56	qreal x = startVector[i].x() + ((endVector[i].x()- startVector[i].x()) * progress);
	57	qreal y = startVector[i].y() + ((endVector[i].y()- startVector[i].y()) * progress);
	58	result << QPointF(x,y);
	59	}
	60
	61	}
	62	break;
	63	case LineDrawAnimation:{
	64	for(int i =0;i< endVector.count()* qBound(0.0, progress, 1.0);i++) {
	65	result << endVector[i];
	66	}
	67	}
	68	break;
	69	default:
	70	qWarning()<<"Unknow type of animation";
	71	break;
	72	}
	73
	74	return qVariantFromValue(result);
	75	}
	76
	77	template <class T, class U>
	78	void XYChartAnimator<T,U>::updateCurrentValue (const QVariant & value )
	79	{
	80	QVector<QPointF> vector = qVariantValue<QVector<QPointF> >(value);
	81	if(state()!=QAbstractAnimation::Stopped){ //workaround
	82	m_item->setGeometry(vector);
	83	}
	84	}
	85
	86	template <class T, class U>
	87	void XYChartAnimator<T,U>::updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState)
	88	{
	89	Q_UNUSED(oldState)
	90	if (newState==QAbstractAnimation::Running) m_item->animationStarted();
	91	QVariantAnimation::updateState(newState,oldState);
	92	}
	93
	94	QTCOMMERCIALCHART_END_NAMESPACE
	95
	96	#endif /* XYCHARTANIMATOR_P_H_ */

example/presenterchart/chartview.cpp +18 -7

             #include "chartview.h"
             #include <qlineseries.h>
+            #include <qscatterseries.h>
+            #include <qsplineseries.h>
             #include <QTime>
             ChartView::ChartView(QWidget* parent):QChartView(parent),
             m_index(0)
             {
+                setChartTitle("Three random line charts");
                 QObject::connect(&m_timer,SIGNAL(timeout()),this,SLOT(handleTimeout()));
                 m_timer.setInterval(3000);
                 QTime now = QTime::currentTime();
                 qsrand((uint)now.msec());
                 QLineSeries* series0 = new QLineSeries(this);
                 QPen blue(Qt::blue);
                 blue.setWidth(3);
                 series0->setPen(blue);
-                QLineSeries* series1 = new QLineSeries(this);
+                QScatterSeries* series1 = new QScatterSeries(this);
                 QPen red(Qt::red);
                 red.setWidth(3);
                 series1->setPen(red);
-                QLineSeries* series2 = new QLineSeries(this);
+                series1->setBrush(Qt::white);
+                QSplineSeries* series2 = new QSplineSeries(this);
                 QPen green(Qt::green);
                 green.setWidth(3);
                 series2->setPen(green);
                 int numPoints = 10;
                 for (int x = 0; x <= numPoints; ++x) {
-                    series0->add(x,  qrand() % 100);
+                    qreal y = qrand() % 100;
-                    series1->add(x,  qrand() % 100);
+                    series0->add(x,y);
-                    series2->add(x,  qrand() % 100);
+                    series1->add(x,y);
+                    series2->add(x,y);
                 }
-                addSeries(series0);
                 m_series<<series0;
+                m_titles<<chartTitle()+": LineChart";
                 m_series<<series1;
+                m_titles<<chartTitle()+": ScatterChart";
                 m_series<<series2;
+                m_titles<<chartTitle()+": SplineChart";
+                addSeries(series0);
+                setChartTitle(m_titles.at(0));
                 m_timer.start();
             }
             ChartView::~ChartView()
             {
                 if(m_series.size()==0) return;
                 removeSeries(m_series.at(m_index));
                 qDeleteAll(m_series);
             }
             void ChartView::handleTimeout()
             {
                 if(m_series.size()==0) return;
                 removeSeries(m_series.at(m_index));
                 m_index++;
                 m_index=m_index%m_series.size();
                 addSeries(m_series.at(m_index));
+                setChartTitle(m_titles.at(m_index));
             }

example/presenterchart/chartview.h +1 0

             #ifndef CHARTVIEW_H_
             #define CHARTVIEW_H_
             #include <qchartview.h>
             #include <QTimer>
             QTCOMMERCIALCHART_USE_NAMESPACE
             class ChartView: public QChartView
             {
                 Q_OBJECT
             public:
                 ChartView(QWidget* parent=0);
                 virtual ~ChartView();
             public slots:
                 void handleTimeout();
             private:
                 QTimer m_timer;
                 QList<QSeries*> m_series;
+                QStringList m_titles;
                 int m_index;
             };
             #endif /* CHARTVIEW_H_ */

example/presenterchart/main.cpp 0 -1

             #include "chartview.h"
             #include <QApplication>
             #include <QMainWindow>
             int main(int argc, char *argv[])
             {
                 QApplication a(argc, argv);
                 QMainWindow window;
                 ChartView chartView(&window);
                 chartView.setRenderHint(QPainter::Antialiasing);
-                chartView.setChartTitle("Three random line charts");
                 chartView.setAnimationOptions(QChart::AllAnimations);
                 window.setCentralWidget(&chartView);
                 window.resize(400, 300);
                 window.show();
                 return a.exec();
             }

src/chartpresenter.cpp +29 -14

             #include "qchart.h"
             #include "qchartaxis.h"
             #include "chartpresenter_p.h"
             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             //series
             #include "qbarseries.h"
             #include "qstackedbarseries.h"
             #include "qpercentbarseries.h"
             #include "qlineseries.h"
             #include "qareaseries.h"
             #include "qpieseries.h"
             #include "qscatterseries.h"
             #include "qsplineseries.h"
             //items
             #include "axisitem_p.h"
             #include "axisanimationitem_p.h"
             #include "areachartitem_p.h"
             #include "barpresenter_p.h"
             #include "stackedbarpresenter_p.h"
             #include "percentbarpresenter_p.h"
             #include "linechartitem_p.h"
-            #include "linechartanimationitem_p.h"
             #include "piepresenter_p.h"
             #include "scatterchartitem_p.h"
             #include "splinechartitem_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ChartPresenter::ChartPresenter(QChart* chart,ChartDataSet* dataset):QObject(chart),
                 m_chart(chart),
                 m_dataset(dataset),
                 m_chartTheme(0),
                 m_zoomIndex(0),
                 m_marginSize(0),
                 m_rect(QRectF(QPoint(0,0),m_chart->size())),
                 m_options(QChart::NoAnimation)
             {
                 createConnections();
                 setChartTheme(QChart::ChartThemeDefault);
             }
             ChartPresenter::~ChartPresenter()
             {
             }
             void ChartPresenter::createConnections()
             {
                 QObject::connect(m_chart,SIGNAL(geometryChanged()),this,SLOT(handleGeometryChanged()));
                 QObject::connect(m_dataset,SIGNAL(seriesAdded(QSeries*,Domain*)),this,SLOT(handleSeriesAdded(QSeries*,Domain*)));
                 QObject::connect(m_dataset,SIGNAL(seriesRemoved(QSeries*)),this,SLOT(handleSeriesRemoved(QSeries*)));
                 QObject::connect(m_dataset,SIGNAL(axisAdded(QChartAxis*,Domain*)),this,SLOT(handleAxisAdded(QChartAxis*,Domain*)));
                 QObject::connect(m_dataset,SIGNAL(axisRemoved(QChartAxis*)),this,SLOT(handleAxisRemoved(QChartAxis*)));
             }
             QRectF ChartPresenter::geometry() const
             {
                 return m_rect;
             }
             void ChartPresenter::handleGeometryChanged()
             {
                 QRectF rect(QPoint(0,0),m_chart->size());
                 rect.adjust(m_marginSize,m_marginSize, -m_marginSize, -m_marginSize);
                 //rewrite zoom stack
                 for(int i=0;i<m_zoomStack.count();i++){
                     QRectF r = m_zoomStack[i];
                     qreal w = rect.width()/m_rect.width();
                     qreal h = rect.height()/m_rect.height();
                     QPointF tl = r.topLeft();
                     tl.setX(tl.x()*w);
                     tl.setY(tl.y()*h);
                     QPointF br = r.bottomRight();
                     br.setX(br.x()*w);
                     br.setY(br.y()*h);
                     r.setTopLeft(tl);
                     r.setBottomRight(br);
                     m_zoomStack[i]=r;
                 }
                 m_rect = rect;
                 Q_ASSERT(m_rect.isValid());
                 emit geometryChanged(m_rect);
             }
             int ChartPresenter::margin() const
             {
                 return m_marginSize;
             }
             void ChartPresenter::setMargin(int margin)
             {
                 m_marginSize = margin;
             }
             void ChartPresenter::handleAxisAdded(QChartAxis* axis,Domain* domain)
             {
                 AxisItem* item ;
                 if(!m_options.testFlag(QChart::GridAxisAnimations))
                 {
                     item = new AxisItem(axis,axis==m_dataset->axisX()?AxisItem::X_AXIS : AxisItem::Y_AXIS,m_chart);
                 }else{
                     item = new AxisAnimationItem(axis,axis==m_dataset->axisX()?AxisItem::X_AXIS : AxisItem::Y_AXIS,m_chart);
                 }
                 if(axis==m_dataset->axisX()){
                     QObject::connect(domain,SIGNAL(rangeXChanged(qreal,qreal)),item,SLOT(handleRangeChanged(qreal,qreal)));
                     //initialize
                     item->handleRangeChanged(domain->minX(),domain->maxX());
                     item->handleTicksCountChanged(4);
                 }
                 else{
                     QObject::connect(domain,SIGNAL(rangeYChanged(qreal,qreal)),item,SLOT(handleRangeChanged(qreal,qreal)));
                     //initialize
                     item->handleRangeChanged(domain->minY(),domain->maxY());
                     item->handleTicksCountChanged(4);
                 }
                 QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&)));
                 //initialize
                 item->handleGeometryChanged(m_rect);
                 m_chartTheme->decorate(axis,item);
                 m_axisItems.insert(axis,item);
             }
             void ChartPresenter::handleAxisRemoved(QChartAxis* axis)
             {
                 AxisItem* item = m_axisItems.take(axis);
                 Q_ASSERT(item);
                 delete item;
             }
             void ChartPresenter::handleSeriesAdded(QSeries* series,Domain* domain)
             {
                 switch(series->type())
                 {
                 case QSeries::SeriesTypeLine: {
                     QLineSeries* lineSeries = static_cast<QLineSeries*>(series);
                     LineChartItem* item;
                     if(m_options.testFlag(QChart::SeriesAnimations)){
                         item = new  LineChartAnimationItem(lineSeries,m_chart);
                     }else{
                         item = new LineChartItem(lineSeries,m_chart);
                     }
                     QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&)));
                     QObject::connect(domain,SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),item,SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
                     //initialize
                     item->handleDomainChanged(domain->minX(),domain->maxX(),domain->minY(),domain->maxY());
                     if(m_rect.isValid()) item->handleGeometryChanged(m_rect);
                     //decorate
                     m_chartTheme->decorate(item,lineSeries,m_chartItems.count());
                     m_chartItems.insert(series,item);
                     break;
                 }
                 case QSeries::SeriesTypeArea: {
                     QAreaSeries* areaSeries = static_cast<QAreaSeries*>(series);
                     AreaChartItem* item;
                     if(m_options.testFlag(QChart::SeriesAnimations)) {
                         item = new AreaChartItem(areaSeries,m_chart);
                     }
                     else {
                         item = new AreaChartItem(areaSeries,m_chart);
                     }
                     QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&)));
                     QObject::connect(domain,SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),item,SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
                     //initialize
                      item->handleDomainChanged(domain->minX(),domain->maxX(),domain->minY(),domain->maxY());
                      if(m_rect.isValid()) item->handleGeometryChanged(m_rect);
                      //decorate
                     m_chartTheme->decorate(item,areaSeries,m_chartItems.count());
                     m_chartItems.insert(series,item);
                     break;
                 }
                 case QSeries::SeriesTypeBar: {
                     QBarSeries* barSeries = static_cast<QBarSeries*>(series);
                     BarPresenter* item = new BarPresenter(barSeries,m_chart);
                     m_chartTheme->decorate(item,barSeries,m_chartItems.count());
                     QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&)));
                     //            QObject::connect(barSeries,SIGNAL(changed(int)),item,SLOT(handleModelChanged(int)));
                     m_chartItems.insert(series,item);
                     // m_axisXItem->setVisible(false);
                     if(m_rect.isValid()) item->handleGeometryChanged(m_rect);
                     break;
                 }
                 case QSeries::SeriesTypeStackedBar: {
                     QStackedBarSeries* stackedBarSeries = static_cast<QStackedBarSeries*>(series);
                     StackedBarPresenter* item = new StackedBarPresenter(stackedBarSeries,m_chart);
                     m_chartTheme->decorate(item,stackedBarSeries,m_chartItems.count());
                     QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&)));
                     //            QObject::connect(stackedBarSeries,SIGNAL(changed(int)),item,SLOT(handleModelChanged(int)));
                     m_chartItems.insert(series,item);
                     if(m_rect.isValid()) item->handleGeometryChanged(m_rect);
                     break;
                 }
                 case QSeries::SeriesTypePercentBar: {
                     QPercentBarSeries* percentBarSeries = static_cast<QPercentBarSeries*>(series);
                     PercentBarPresenter* item = new PercentBarPresenter(percentBarSeries,m_chart);
                     m_chartTheme->decorate(item,percentBarSeries ,m_chartItems.count());
                     QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&)));
                     //            QObject::connect(percentBarSeries,SIGNAL(changed(int)),item,SLOT(handleModelChanged(int)));
                     m_chartItems.insert(series,item);
                     if(m_rect.isValid()) item->handleGeometryChanged(m_rect);
                     break;
                 }
                 case QSeries::SeriesTypeScatter: {
             			QScatterSeries *scatterSeries = qobject_cast<QScatterSeries *>(series);
-                    ScatterChartItem *scatterPresenter = new ScatterChartItem(scatterSeries, m_chart);
+            			ScatterChartItem *item;
+            			if(m_options.testFlag(QChart::SeriesAnimations)) {
+            				item = new ScatterChartAnimationItem(scatterSeries,m_chart);
+            			} else {
+            				item = new ScatterChartItem(scatterSeries, m_chart);
+            			}
             			QObject::connect(this, SIGNAL(geometryChanged(const QRectF&)),
-                                     scatterPresenter, SLOT(handleGeometryChanged(const QRectF&)));
+            					item, SLOT(handleGeometryChanged(const QRectF&)));
             			QObject::connect(domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),
-                                     scatterPresenter, SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
+            					item, SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
-                    m_chartTheme->decorate(scatterPresenter, scatterSeries, m_chartItems.count());
+            			//initialize
-                    m_chartItems.insert(scatterSeries, scatterPresenter);
             			if (m_rect.isValid())
-                        scatterPresenter->handleGeometryChanged(m_rect);
+            			item->handleGeometryChanged(m_rect);
-                    scatterPresenter->handleDomainChanged(domain->minX(), domain->maxX(), domain->minY(), domain->maxY());
+            			item->handleDomainChanged(domain->minX(), domain->maxX(), domain->minY(), domain->maxY());
+            			//decorate
+            			m_chartTheme->decorate(item, scatterSeries, m_chartItems.count());
+            			m_chartItems.insert(scatterSeries, item);
             			break;
             		}
                 case QSeries::SeriesTypePie: {
                     QPieSeries *s = qobject_cast<QPieSeries *>(series);
                     PiePresenter* pie = new PiePresenter(m_chart, s);
                     m_chartTheme->decorate(pie, s, m_chartItems.count());
                     QObject::connect(this, SIGNAL(geometryChanged(const QRectF&)), pie, SLOT(handleGeometryChanged(const QRectF&)));
                     // Hide all from background when there is only piechart
                     // TODO: refactor this ugly code... should be one setting for this
                     if (m_chartItems.count() == 0) {
                         m_chart->axisX()->setAxisVisible(false);
                         m_chart->axisY()->setAxisVisible(false);
                         m_chart->axisX()->setGridVisible(false);
                         m_chart->axisY()->setGridVisible(false);
                         m_chart->axisX()->setLabelsVisible(false);
                         m_chart->axisY()->setLabelsVisible(false);
                         m_chart->axisX()->setShadesVisible(false);
                         m_chart->axisY()->setShadesVisible(false);
                         m_chart->setChartBackgroundBrush(Qt::transparent);
                     }
                     m_chartItems.insert(series, pie);
                     pie->handleGeometryChanged(m_rect);
                     break;
                 }
                 case QSeries::SeriesTypeSpline: {
             			QSplineSeries* splineSeries = qobject_cast<QSplineSeries*>(series);
-                    SplineChartItem* splinePresenter = new SplineChartItem(splineSeries, m_chart);
+            			SplineChartItem* item;
-                    QObject::connect(this, SIGNAL(geometryChanged(const QRectF&)), splinePresenter, SLOT(handleGeometryChanged(const QRectF&)));
+            			if(m_options.testFlag(QChart::SeriesAnimations)) {
-                    QObject::connect(domain,SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),splinePresenter,SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
+            				item = new SplineChartAnimationItem(splineSeries, m_chart);
+            			} else {
+            				item = new SplineChartItem(splineSeries, m_chart);
+            			}
+            			QObject::connect(this, SIGNAL(geometryChanged(const QRectF&)), item, SLOT(handleGeometryChanged(const QRectF&)));
+            			QObject::connect(domain,SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),item,SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
             			//initialize
-                    splinePresenter->handleDomainChanged(domain->minX(),domain->maxX(),domain->minY(),domain->maxY());
+            			item->handleDomainChanged(domain->minX(),domain->maxX(),domain->minY(),domain->maxY());
-                    m_chartTheme->decorate(splinePresenter, splineSeries, m_chartItems.count());
+            			if(m_rect.isValid()) item->handleGeometryChanged(m_rect);
-                    m_chartItems.insert(splineSeries, splinePresenter);
+            			//decorate
+            			m_chartTheme->decorate(item, splineSeries, m_chartItems.count());
+            			m_chartItems.insert(splineSeries, item);
             			break;
             		}
                 default: {
                     qDebug()<< "Series type" << series->type() << "not implemented.";
                     break;
                 }
                 }
                 zoomReset();
             }
             void ChartPresenter::handleSeriesRemoved(QSeries* series)
             {
                 ChartItem* item = m_chartItems.take(series);
                 delete item;
             }
             void ChartPresenter::setChartTheme(QChart::ChartTheme theme)
             {
                 delete m_chartTheme;
                 m_chartTheme = ChartTheme::createTheme(theme);
                 m_chartTheme->decorate(m_chart);
                 QMapIterator<QSeries*,ChartItem*> i(m_chartItems);
                 int index=0;
                 while (i.hasNext()) {
                     i.next();
                     m_chartTheme->decorate(i.value(),i.key(),index);
                     index++;
                 }
                 QMapIterator<QChartAxis*,AxisItem*> j(m_axisItems);
                 while (j.hasNext()) {
                     j.next();
                     m_chartTheme->decorate(j.key(),j.value());
                 }
             }
             QChart::ChartTheme ChartPresenter::chartTheme()
             {
                 return m_chartTheme->id();
             }
             void ChartPresenter::setAnimationOptions(QChart::AnimationOptions options)
             {
                 if(m_options!=options) {
                     m_options=options;
                     //recreate elements
                     QList<QChartAxis*> axisList = m_axisItems.uniqueKeys();
                     QList<QSeries*> seriesList = m_chartItems.uniqueKeys();
                     foreach(QChartAxis* axis, axisList) {
                         handleAxisRemoved(axis);
                         handleAxisAdded(axis,m_dataset->domain(axis));
                     }
                     foreach(QSeries* series, seriesList) {
                         handleSeriesRemoved(series);
                         handleSeriesAdded(series,m_dataset->domain(series));
                     }
                 }
             }
             void ChartPresenter::zoomIn()
             {
             	QRectF rect = geometry();
             	rect.setWidth(rect.width()/2);
             	rect.setHeight(rect.height()/2);
             	rect.moveCenter(geometry().center());
             	zoomIn(rect);
             }
             void ChartPresenter::zoomIn(const QRectF& rect)
             {
             	QRectF r = rect.normalized();
             	r.translate(-m_marginSize, -m_marginSize);
             	m_dataset->zoomInDomain(r,geometry().size());
             	m_zoomStack<<r;
             	m_zoomIndex++;
             }
             void ChartPresenter::zoomOut()
             {
             	if(m_zoomIndex==0) return;
             	m_dataset->zoomOutDomain(m_zoomStack[m_zoomIndex-1],geometry().size());
             	m_zoomIndex--;
             	m_zoomStack.resize(m_zoomIndex);
             }
             void ChartPresenter::zoomReset()
             {
                 m_zoomIndex=0;
                 m_zoomStack.resize(m_zoomIndex);
             }
             QChart::AnimationOptions ChartPresenter::animationOptions() const
             {
                 return m_options;
             }
             #include "moc_chartpresenter_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/charttheme.cpp +7 -6

             #include "charttheme_p.h"
             #include "qchart.h"
             #include "qchartaxis.h"
             #include <QTime>
             //series
             #include "qbarset.h"
             #include "qbarseries.h"
             #include "qstackedbarseries.h"
             #include "qpercentbarseries.h"
             #include "qlineseries.h"
             #include "qareaseries.h"
             #include "qscatterseries.h"
             #include "qpieseries.h"
             #include "qpieslice.h"
             #include "qsplineseries.h"
             //items
             #include "axisitem_p.h"
             #include "barpresenter_p.h"
             #include "stackedbarpresenter_p.h"
             #include "percentbarpresenter_p.h"
             #include "linechartitem_p.h"
             #include "areachartitem_p.h"
             #include "scatterchartitem_p.h"
             #include "piepresenter_p.h"
             #include "splinechartitem_p.h"
             //themes
             #include "chartthemevanilla_p.h"
             #include "chartthemeicy_p.h"
             #include "chartthemegrayscale_p.h"
             #include "chartthemescientific_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /* TODO
                 case QChart::ChartThemeUnnamed1:
                     m_seriesThemes.append(SeriesTheme(QColor(QRgb(0xff3fa9f5)), 2));
                     m_seriesThemes.append(SeriesTheme(QColor(QRgb(0xff7AC943)), 2));
                     m_seriesThemes.append(SeriesTheme(QColor(QRgb(0xffFF931E)), 2));
                     m_seriesThemes.append(SeriesTheme(QColor(QRgb(0xffFF1D25)), 2));
                     m_seriesThemes.append(SeriesTheme(QColor(QRgb(0xffFF7BAC)), 2));
                     m_gradientStartColor = QColor(QRgb(0xfff3dc9e));
                     m_gradientEndColor = QColor(QRgb(0xffafafaf));
             */
             ChartTheme::ChartTheme(QChart::ChartTheme id)
             {
                 m_id = id;
                 m_seriesColor.append(QRgb(0xff000000));
                 m_seriesColor.append(QRgb(0xff707070));
                 m_gradientStartColor = QColor(QRgb(0xffffffff));
                 m_gradientEndColor = QColor(QRgb(0xffafafaf));
                 qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
             }
             ChartTheme* ChartTheme::createTheme(QChart::ChartTheme theme)
             {
                 switch(theme) {
                     case QChart::ChartThemeDefault:
                         return new ChartTheme();
                     case QChart::ChartThemeVanilla:
                         return new ChartThemeVanilla();
                     case QChart::ChartThemeIcy:
                         return new ChartThemeIcy();
                     case QChart::ChartThemeGrayscale:
                         return new ChartThemeGrayscale();
                     case QChart::ChartThemeScientific:
                         return new ChartThemeScientific();
                 }
             }
             void ChartTheme::decorate(QChart* chart)
             {
                 QLinearGradient backgroundGradient;
                 backgroundGradient.setColorAt(0.0, m_gradientStartColor);
                 backgroundGradient.setColorAt(1.0, m_gradientEndColor);
                 backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
                 chart->setChartBackgroundBrush(backgroundGradient);
             }
             //TODO helper to by removed later
             void ChartTheme::decorate(ChartItem* item, QSeries* series,int count)
             {
                 switch(series->type())
                 {
                     case QSeries::SeriesTypeLine: {
                         QLineSeries* s = static_cast<QLineSeries*>(series);
                         LineChartItem* i = static_cast<LineChartItem*>(item);
                         decorate(i,s,count);
                         break;
                     }
                     case QSeries::SeriesTypeArea: {
                                QAreaSeries* s = static_cast<QAreaSeries*>(series);
                                AreaChartItem* i = static_cast<AreaChartItem*>(item);
                                decorate(i,s,count);
                                break;
                     }
                     case QSeries::SeriesTypeBar: {
                         QBarSeries* b = static_cast<QBarSeries*>(series);
                         BarPresenter* i = static_cast<BarPresenter*>(item);
                         decorate(i,b,count);
                         break;
                     }
                     case QSeries::SeriesTypeStackedBar: {
                         QStackedBarSeries* s = static_cast<QStackedBarSeries*>(series);
                         StackedBarPresenter* i = static_cast<StackedBarPresenter*>(item);
                         decorate(i,s,count);
                         break;
                     }
                     case QSeries::SeriesTypePercentBar: {
                         QPercentBarSeries* s = static_cast<QPercentBarSeries*>(series);
                         PercentBarPresenter* i = static_cast<PercentBarPresenter*>(item);
                         decorate(i,s,count);
                         break;
                     }
                     case QSeries::SeriesTypeScatter: {
                         QScatterSeries* s = qobject_cast<QScatterSeries*>(series);
                         Q_ASSERT(s);
                         ScatterChartItem* i = static_cast<ScatterChartItem*>(item);
                         Q_ASSERT(i);
                         decorate(i, s, count);
                         break;
                     }
                     case QSeries::SeriesTypePie: {
                         QPieSeries* s = static_cast<QPieSeries*>(series);
                         PiePresenter* i = static_cast<PiePresenter*>(item);
                         decorate(i,s,count);
                         break;
                     }
                     default:
                     qDebug()<<"Wrong item to be decorated by theme";
                     break;
                 }
             }
             void ChartTheme::decorate(AreaChartItem* item, QAreaSeries* series,int count)
             {
                 QPen pen;
                 QBrush brush;
                 if(pen != series->pen()){
                    item->setPen(series->pen());
                 }else{
                     pen.setColor(m_seriesColor.at(count%m_seriesColor.size()));
                     pen.setWidthF(2);
                     item->setPen(pen);
                 }
                 if(brush != series->brush()){
                    item->setBrush(series->brush());
                 }else{
                    QBrush brush(m_seriesColor.at(count%m_seriesColor.size()));
                    item->setBrush(brush);
                 }
             }
             void ChartTheme::decorate(LineChartItem* item, QLineSeries* series,int count)
             {
                 QPen pen;
                 if(pen != series->pen()){
-                    item->setPen(series->pen());
+                    item->setLinePen(series->pen());
                     return;
                 }
                 pen.setColor(m_seriesColor.at(count%m_seriesColor.size()));
                 pen.setWidthF(2);
-                item->setPen(pen);
+                item->setLinePen(pen);
             }
             void ChartTheme::decorate(BarPresenter* item, QBarSeries* series,int count)
             {
                 QList<QBarSet*> sets = series->barSets();
                 for (int i=0; i<series->barsetCount(); i++) {
                     sets.at(i)->setBrush(QBrush(m_seriesColor.at(i%m_seriesColor.count())));
                 }
             }
             void ChartTheme::decorate(StackedBarPresenter* item, QStackedBarSeries* series,int count)
             {
                 QList<QBarSet*> sets = series->barSets();
                 for (int i=0; i<series->barsetCount(); i++) {
                     sets.at(i)->setBrush(QBrush(m_seriesColor.at(i%m_seriesColor.count())));
                 }
             }
             void ChartTheme::decorate(PercentBarPresenter* item, QPercentBarSeries* series,int count)
             {
                 QList<QBarSet*> sets = series->barSets();
                 for (int i=0; i<series->barsetCount(); i++) {
                     sets.at(i)->setBrush(QBrush(m_seriesColor.at(i%m_seriesColor.count())));
                 }
             }
             void ChartTheme::decorate(ScatterChartItem* item, QScatterSeries* series, int count)
             {
                 Q_ASSERT(item);
                 Q_ASSERT(series);
                 QColor color = m_seriesColor.at(count % m_seriesColor.size());
                 // TODO: define alpha in the theme? or in the series?
                 //color.setAlpha(120);
                 QBrush brush(color, Qt::SolidPattern);
                 item->setBrush(Qt::blue);
                 QPen pen(brush, 3);
                 pen.setColor(color);
                 item->setPen(pen);
             }
             void ChartTheme::decorate(PiePresenter* item, QPieSeries* series, int /*count*/)
             {
                 // create a list of slice colors based on current theme
                 int i = 0;
                 QList<QColor> colors;
                 while (colors.count() < series->count()) {
                     // get base color
                     QColor c = m_seriesColor[i++];
                     i = i % m_seriesColor.count();
                     // dont use black colors... looks bad
                     if (c == Qt::black)
                         continue;
                     // by default use the "raw" theme color
                     if (!colors.contains(c)) {
                         colors << c;
                         continue;
                     }
                     // ...ok we need to generate something that looks like the same color
                     // but different lightness
                     int tryCount = 0;
                     while (tryCount++ < 100) {
                         // find maximum value we can raise the lightness
                         int lMax = 255;
                         if (lMax > 255 - c.red())
                             lMax = 255 - c.red();
                         if (lMax > 255 - c.green())
                             lMax = 255 - c.green();
                         if (lMax > 255 - c.blue())
                             lMax = 255 - c.blue();
                         // find maximum value we can make it darker
                         int dMax = 255;
                         if (dMax > c.red())
                             dMax = c.red();
                         if (dMax > c.green())
                             dMax = c.green();
                         if (dMax > c.blue())
                             dMax = c.blue();
                         int max = dMax + lMax;
                         if (max == 0) {
                             // no room to make color lighter or darker...
                             qDebug() << "cannot generate a color for pie!";
                             break;
                         }
                         // generate random color
                         int r = c.red() - dMax;
                         int g = c.green() - dMax;
                         int b = c.blue() - dMax;
                         int d = qrand() % max;
                         c.setRgb(r+d, g+d, b+d);
                         // found a unique color?
                         if (!colors.contains(c))
                             break;
                     }
                     qDebug() << "generated a color for pie" << c;
                     colors << c;
                 }
                 // finally update colors
                 foreach (QPieSlice* s, series->slices()) {
                     QColor c = colors.takeFirst();
                     s->setSlicePen(c);
                     s->setSliceBrush(c);
                 }
             }
             void ChartTheme::decorate(QChartAxis* axis,AxisItem* item)
             {
                 //TODO: dummy defults for now
                 axis->setLabelsBrush(Qt::black);
                 axis->setLabelsPen(Qt::NoPen);
                 axis->setShadesPen(Qt::NoPen);
                 axis->setShadesOpacity(0.5);
             }
             void ChartTheme::decorate(SplineChartItem* item, QSplineSeries* series, int count)
             {
                 Q_ASSERT(item);
                 Q_ASSERT(series);
                 QPen pen;
                 if(pen != series->pen()){
-                    item->setPen(series->pen());
+                    item->setLinePen(series->pen());
-                    return;
+                }else{
                     pen.setColor(m_seriesColor.at(count%m_seriesColor.size()));
                     pen.setWidthF(series->pen().widthF());
-                item->setPen(pen);
+                    item->setLinePen(series->pen());
+                }
             //    QColor color = m_seriesColor.at(count % m_seriesColor.size());
                 // TODO: define alpha in the theme? or in the series?
                 //color.setAlpha(120);
             //    QBrush brush(color, Qt::SolidPattern);
             //    presenter->m_markerBrush = brush;
             //    QPen pen(brush, 3);
             //    pen.setColor(color);
             //    presenter->m_markerPen = pen;
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/linechart/linechart.pri +1 -3

             INCLUDEPATH += $$PWD
             DEPENDPATH += $$PWD
             SOURCES += \
-                $$PWD/linechartanimationitem.cpp \
                 $$PWD/linechartitem.cpp \
                 $$PWD/qlineseries.cpp
             PRIVATE_HEADERS += \
-                $$PWD/linechartitem_p.h \
+                $$PWD/linechartitem_p.h
-                $$PWD/linechartanimationitem_p.h
             PUBLIC_HEADERS += \
                 $$PWD/qlineseries.h

src/linechart/linechartanimationitem.cpp 0 -1

             #include "linechartanimationitem_p.h"
             #include "linechartitem_p.h"
             #include <QPropertyAnimation>
             #include <QTimer>
             Q_DECLARE_METATYPE(QVector<QPointF>)
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             const static int duration = 500;
             LineChartAnimationItem::LineChartAnimationItem(QLineSeries* series,QGraphicsItem *parent):
             LineChartItem(series,parent),
             m_animation(new LineChartAnimatator(this,this)),
             m_dirty(false)
             {
             }
             LineChartAnimationItem::~LineChartAnimationItem()
             {
             }
             void LineChartAnimationItem::updatePoints(QVector<QPointF>& newPoints)
             {
                 QVector<QPointF> oldPoints = points();
                 LineChartItem::updatePoints(newPoints);
                 if(newPoints.count()==0) return;
                 oldPoints.resize(newPoints.size());
                 if(m_animation->state()!=QAbstractAnimation::Stopped){
                    m_animation->stop();
                 }
                 m_animation->setDuration(duration);
                 m_animation->setEasingCurve(QEasingCurve::InOutBack);
                 m_animation->setKeyValueAt(0.0, qVariantFromValue(oldPoints));
                 m_animation->setKeyValueAt(1.0, qVariantFromValue(newPoints));
                 QTimer::singleShot(0,m_animation,SLOT(start()));
                 m_points = newPoints;
                 m_dirty=false;
             }
             void LineChartAnimationItem::updatePoint(int index,QPointF& newPoint)
             {
                 if(m_animation->state()!=QAbstractAnimation::Stopped){
                    m_animation->stop();
                    m_dirty=true;
                 }
                 if(m_dirty){
                 	m_points=points();
                 	m_dirty=false;
                 }
                 LineChartItem::updatePoint(index,newPoint);
                 m_animation->setDuration(duration);
                 m_animation->setEasingCurve(QEasingCurve::InOutBack);
                 m_animation->setKeyValueAt(0.0, qVariantFromValue(m_points));
                 m_animation->setKeyValueAt(1.0, qVariantFromValue( points()));
                 QTimer::singleShot(0,this,SLOT(startAnimation()));
             }
             void LineChartAnimationItem::startAnimation()
             {
             	 m_dirty=true;
             	 m_animation->start();
             }
             LineChartAnimatator::LineChartAnimatator(LineChartAnimationItem *item , QObject *parent):QVariantAnimation(parent),
                 m_item(item)
             {
             }
             LineChartAnimatator::~LineChartAnimatator()
             {
             }
             QVariant LineChartAnimatator::interpolated(const QVariant &start, const QVariant & end, qreal progress ) const
             {
             	QVector<QPointF> startVector = qVariantValue<QVector<QPointF> >(start);
             	QVector<QPointF> endVecotr = qVariantValue<QVector<QPointF> >(end);
             	QVector<QPointF> result;
                 Q_ASSERT(startVector.count() == endVecotr.count());
                 for(int i =0 ;i< startVector.count();i++){
                        qreal x = startVector[i].x() + ((endVecotr[i].x()- startVector[i].x()) * progress);//qBound(0.0, progress, 1.0));
                        qreal y = startVector[i].y() + ((endVecotr[i].y()- startVector[i].y()) * progress);//qBound(0.0, progress, 1.0));
                        result << QPointF(x,y);
                 }
                 return qVariantFromValue(result);
             }
             void LineChartAnimatator::updateCurrentValue (const QVariant & value )
             {
             	QVector<QPointF> vector = qVariantValue<QVector<QPointF> >(value);
             	if(state()!=QAbstractAnimation::Stopped){ //workaround
                 m_item->setGeometry(vector);
             	}
             }
             #include "moc_linechartanimationitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/linechart/linechartitem.cpp +2 -3

             #include "linechartitem_p.h"
             #include "qlineseries.h"
             #include "chartpresenter_p.h"
             #include <QPainter>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             //TODO: optimize : remove points which are not visible
             LineChartItem::LineChartItem(QLineSeries* series,QGraphicsItem *parent):XYChartItem(series,parent),
             m_series(series),
             m_items(this)
             {
             	//m_items.setZValue(ChartPresenter::LineChartZValue);
                 setZValue(ChartPresenter::LineChartZValue);
                 QObject::connect(series,SIGNAL(updated()),this,SLOT(handleUpdated()));
                 handleUpdated();
             }
             QRectF LineChartItem::boundingRect() const
             {
             	return m_rect;
             }
             QPainterPath LineChartItem::shape() const
             {
                 return m_path;
             }
             void LineChartItem::createPoints(int count)
             {
                 for (int i = 0; i < count; ++i) {
                     QGraphicsRectItem* item = new QGraphicsRectItem(0,0,3,3);
                     m_items.addToGroup(item);
                 }
             }
             void LineChartItem::deletePoints(int count)
             {
                 QList<QGraphicsItem *> items = m_items.childItems();
                 for (int i = 0; i < count; ++i) {
                     delete(items.takeLast());
                 }
             }
             void LineChartItem::setGeometry(QVector<QPointF>& points)
             {
                 if(points.size()==0) return;
                 int diff =  XYChartItem::points().size() - points.size();
                 if(diff>0) {
                     deletePoints(diff);
                 }
                 else if(diff<0) {
                     createPoints(-diff);
                 }
                 QList<QGraphicsItem*> items = m_items.childItems();
                 QPainterPath path;
                 const QPointF& point = points.at(0);
                 path.moveTo(point);
                 QGraphicsItem* item = items.at(0);
                 item->setPos(point.x()-1,point.y()-1);
                 if(!clipRect().contains(point)) {
                     item->setVisible(false);
                 }
                 else {
                     item->setVisible(true);
                 }
                 for(int i=1; i< points.size();i++) {
                     QGraphicsItem* item = items.at(i);
                     const QPointF& point = points.at(i);
                     item->setPos(point.x()-1,point.y()-1);
                     if(!clipRect().contains(point)) {
                         item->setVisible(false);
                     }
                     else {
                         item->setVisible(true);
                     }
                     path.lineTo(point);
                 }
                 prepareGeometryChange();
                 m_path = path;
                 m_rect = path.boundingRect();
                 XYChartItem::setGeometry(points);
             }
-            void LineChartItem::setPen(const QPen& pen)
+            void LineChartItem::setLinePen(const QPen& pen)
             {
                 m_pen = pen;
             }
             void LineChartItem::handleUpdated()
             {
                 m_items.setVisible(m_series->pointsVisible());
-                setPen(m_series->pen());
+                setLinePen(m_series->pen());
                 update();
             }
             //painter
             void LineChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 Q_UNUSED(widget);
                 Q_UNUSED(option);
                 painter->save();
                 painter->setPen(m_pen);
                 painter->setClipRect(clipRect());
                 painter->drawPath(m_path);
                 painter->restore();
             }
             #include "moc_linechartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/linechart/linechartitem_p.h +5 -2

             #ifndef LINECHARTITEM_H
             #define LINECHARTITEM_H
             #include "qchartglobal.h"
             #include "xychartitem_p.h"
+            #include "xychartanimationitem_p.h"
             #include <QPen>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartPresenter;
             class QLineSeries;
             class LineChartItem :  public XYChartItem
             {
                  Q_OBJECT
             public:
                  explicit LineChartItem(QLineSeries* series,QGraphicsItem *parent = 0);
                 ~ LineChartItem(){};
                 //from QGraphicsItem
                 QRectF boundingRect() const;
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
                 QPainterPath shape() const;
-                void setPen(const QPen& pen);
+                void setLinePen(const QPen& pen);
                 void setPointsVisible(bool visible);
             public slots:
                 void handleUpdated();
             protected:
                 virtual void setGeometry(QVector<QPointF>& points);
             private:
                 void createPoints(int count);
                 void deletePoints(int count);
             private:
                 QLineSeries* m_series;
                 QGraphicsItemGroup m_items;
                 QPainterPath m_path;
                 QRectF m_rect;
                 QPen m_pen;
-                friend class LineChartAnimatator;
+                template<class,class> friend class XYChartAnimator;
             };
+            typedef XYChartAnimationItem<LineChartItem,QLineSeries> LineChartAnimationItem;
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/qchart.cpp +13 -2

             #include "qchart.h"
             #include "qchartaxis.h"
             #include "chartpresenter_p.h"
             #include "chartdataset_p.h"
             #include <QGraphicsScene>
             #include <QGraphicsSceneResizeEvent>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \enum QChart::ChartTheme
                 This enum describes the theme used by the chart.
                 \value ChartThemeDefault
                 \value ChartThemeVanilla
                 \value ChartThemeIcy
                 \value ChartThemeGrayscale
                 \value ChartThemeScientific
             */
             /*!
                 \enum QChart::AnimationOption
                 For enabling/disabling animations. Defaults to NoAnimation.
                 \value NoAnimation
                 \value GridAxisAnimations
                 \value SeriesAnimations
                 \value AllAnimations
             */
             /*!
                 \class QChart
                 \brief QtCommercial chart API.
                 QChart is a QGraphicsWidget that you can show in a QGraphicsScene. It manages the graphical
                 representation of different types of QChartSeries and other chart related objects like
                 QChartAxis and QChartLegend. If you simply want to show a chart in a layout, you can use the
                 convenience class QChartView instead of QChart.
                 \sa QChartView
             */
             /*!
                 Constructs a chart object which is a child of a\a parent. Parameter \a wFlags is passed to the QGraphicsWidget constructor.
             */
             QChart::QChart(QGraphicsItem *parent, Qt::WindowFlags wFlags) : QGraphicsWidget(parent,wFlags),
                 m_backgroundItem(0),
                 m_titleItem(0),
                 m_dataset(new ChartDataSet(this)),
                 m_presenter(new ChartPresenter(this,m_dataset))
             {
             }
             /*!
                 Destroys the object and it's children, like QChartSeries and QChartAxis object added to it.
             */
             QChart::~QChart()
             {
             }
             /*!
                 Adds the \a series and optional \a axisY onto the chart and takes the ownership of the objects.
                 If auto scaling is enabled, re-scales the axes the series is bound to (both the x axis and
                 the y axis).
             */
             void QChart::addSeries(QSeries* series, QChartAxis* axisY)
             {
                 m_dataset->addSeries(series, axisY);
             }
             /*!
                 Removes the \a series specified in a perameter from the QChartView.
                 It releses its ownership of the specified QChartSeries object.
                 It does not delete the pointed QChartSeries data object
                 \sa addSeries(), removeAllSeries()
             */
             void QChart::removeSeries(QSeries* series)
             {
                 m_dataset->removeSeries(series);
             }
             /*!
                 Removes all the QChartSeries that have been added to the QChartView
                 It also deletes the pointed QChartSeries data objects
                 \sa addSeries(), removeSeries()
             */
             void QChart::removeAllSeries()
             {
                 m_dataset->removeAllSeries();
             }
             /*!
                 Sets the \a brush that is used for painting the background of the chart area.
             */
             void QChart::setChartBackgroundBrush(const QBrush& brush)
             {
                 createChartBackgroundItem();
                 m_backgroundItem->setBrush(brush);
                 m_backgroundItem->update();
             }
             /*!
                 Sets the \a pen that is used for painting the background of the chart area.
             */
             void QChart::setChartBackgroundPen(const QPen& pen)
             {
                 createChartBackgroundItem();
                 m_backgroundItem->setPen(pen);
                 m_backgroundItem->update();
             }
             /*!
                 Sets the chart \a title. The description text that is rendered above the chart.
             */
             void QChart::setChartTitle(const QString& title)
             {
                 createChartTitleItem();
-                m_titleItem->setPlainText(title);
+                m_titleItem->setText(title);
+            }
+            /*!
+                Gets the chart \a title. The description text that is rendered above the chart.
+            */
+            QString QChart::chartTitle() const
+            {
+                if(m_titleItem)
+                return m_titleItem->text();
+                else
+                return QString();
             }
             /*!
                 Sets the \a font that is used for rendering the description text that is rendered above the chart.
             */
             void QChart::setChartTitleFont(const QFont& font)
             {
                 createChartTitleItem();
                 m_titleItem->setFont(font);
             }
             void QChart::createChartBackgroundItem()
             {
                 if(!m_backgroundItem) {
                     m_backgroundItem = new QGraphicsRectItem(this);
                     m_backgroundItem->setPen(Qt::NoPen);
                     m_backgroundItem->setZValue(ChartPresenter::BackgroundZValue);
                 }
             }
             void QChart::createChartTitleItem()
             {
                 if(!m_titleItem) {
-                    m_titleItem = new QGraphicsTextItem(this);
+                    m_titleItem = new QGraphicsSimpleTextItem(this);
                     m_titleItem->setZValue(ChartPresenter::BackgroundZValue);
                 }
             }
             /*!
                 Returns the chart margin, which is the distance between the widget edge and the part of the chart where the actual data can be displayed.
                 \sa setMargin()
             */
             int QChart::margin() const
             {
                 return m_presenter->margin();
             }
             /*!
                 Sets the chart \a margin, which is the distance between the widget edge and the part of the chart where the actual data can be displayed.
                 \sa margin()
             */
             void QChart::setMargin(int margin)
             {
                 m_presenter->setMargin(margin);
             }
             /*!
                 Sets the \a theme used by the chart for rendering the graphical representation of the data
                 \sa ChartTheme, chartTheme()
             */
             void QChart::setChartTheme(QChart::ChartTheme theme)
             {
                 m_presenter->setChartTheme(theme);
             }
             /*!
                 Returns the theme enum used by the chart.
                 \sa ChartTheme, setChartTheme()
             */
             QChart::ChartTheme QChart::chartTheme() const
             {
                 return m_presenter->chartTheme();
             }
             /*!
                 Zooms in the view by a factor of 2
             */
             void QChart::zoomIn()
             {
                 m_presenter->zoomIn();
             }
             /*!
                 Zooms in the view to a maximum level at which \a rect is still fully visible.
             */
             void QChart::zoomIn(const QRectF& rect)
             {
                 if(!rect.isValid()) return;
                 m_presenter->zoomIn(rect);
             }
             /*!
                 Restores the view zoom level to the previous one.
             */
             void QChart::zoomOut()
             {
                 m_presenter->zoomOut();
             }
             /*!
                 Resets to the default view.
             */
             void QChart::zoomReset()
             {
                 m_presenter->zoomReset();
             }
             /*!
                 Returns the pointer to the x axis object of the chart
             */
             QChartAxis* QChart::axisX() const
             {
                 return m_dataset->axisX();
             }
             /*!
                 Returns the pointer to the y axis object of the chart
             */
             QChartAxis* QChart::axisY() const
             {
                 return m_dataset->axisY();
             }
             /*!
                 Resizes and updates the chart area using the \a event data
             */
             void QChart::resizeEvent(QGraphicsSceneResizeEvent *event)
             {
                 m_rect = QRectF(QPoint(0,0),event->newSize());
                 QRectF rect = m_rect.adjusted(margin(),margin(), -margin(), -margin());
                 // recalculate title position
                 if (m_titleItem) {
                     QPointF center = m_rect.center() -m_titleItem->boundingRect().center();
                     m_titleItem->setPos(center.x(),m_rect.top()/2 + margin()/2);
                 }
                 //recalculate background gradient
                 if (m_backgroundItem) {
                     m_backgroundItem->setRect(rect);
                 }
                 QGraphicsWidget::resizeEvent(event);
                 update();
             }
             /*!
                 Sets animation \a options for the chart
             */
             void QChart::setAnimationOptions(AnimationOptions options)
             {
                 m_presenter->setAnimationOptions(options);
             }
             /*!
                 Returns animation options for the chart
             */
             QChart::AnimationOptions QChart::animationOptions() const
             {
                 return m_presenter->animationOptions();
             }
             #include "moc_qchart.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchart.h +2 -1

             #ifndef QCHART_H
             #define QCHART_H
             #include <qchartglobal.h>
             #include <qseries.h>
             #include <QGraphicsWidget>
             #include <QLinearGradient>
             #include <QFont>
             class QGraphicsSceneResizeEvent;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class AxisItem;
             class QSeries;
             class PlotDomain;
             class BarPresenter;
             class QChartAxis;
             class ChartTheme;
             class ChartItem;
             class ChartDataSet;
             class ChartPresenter;
             class QTCOMMERCIALCHART_EXPORT QChart : public QGraphicsWidget
             {
                 Q_OBJECT
             public:
                 enum ChartTheme {
                     ChartThemeDefault,
                     ChartThemeVanilla,
                     ChartThemeIcy,
                     ChartThemeGrayscale,
                     ChartThemeScientific
                     //ChartThemeUnnamed1
                     /*! The default theme follows the GUI style of the Operating System */
                 };
                 enum  AnimationOption {
                     NoAnimation = 0x0,
                     GridAxisAnimations = 0x1,
                     SeriesAnimations =0x2,
                     AllAnimations = 0x3
                     };
                     Q_DECLARE_FLAGS(AnimationOptions, AnimationOption)
             public:
                 QChart(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0);
                 ~QChart();
                 void addSeries(QSeries* series, QChartAxis* axisY = 0);
                 void removeSeries(QSeries* series); //returns ownership , deletes axis if no series attached
                 void removeAllSeries(); // deletes series and axis
                 void setMargin(int margin);
                 int margin() const;
                 void setChartTheme(QChart::ChartTheme theme);
                 QChart::ChartTheme chartTheme() const;
                 void setChartTitle(const QString& title);
+                QString chartTitle() const;
                 void setChartTitleFont(const QFont& font);
                 void setChartBackgroundBrush(const QBrush& brush);
                 void setChartBackgroundPen(const QPen& pen);
                 void setAnimationOptions(AnimationOptions options);
                 AnimationOptions animationOptions() const;
                 void zoomIn();
                 void zoomIn(const QRectF& rect);
                 void zoomOut();
                 void zoomReset();
                 QChartAxis* axisX() const;
                 QChartAxis* axisY() const;
             protected:
                 void resizeEvent(QGraphicsSceneResizeEvent *event);
             private:
                 inline void createChartBackgroundItem();
                 inline void createChartTitleItem();
             private:
                 Q_DISABLE_COPY(QChart)
                 QGraphicsRectItem* m_backgroundItem;
-                QGraphicsTextItem* m_titleItem;
+                QGraphicsSimpleTextItem* m_titleItem;
                 QRectF m_rect;
                 ChartDataSet *m_dataset;
                 ChartPresenter *m_presenter;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             Q_DECLARE_OPERATORS_FOR_FLAGS(QTCOMMERCIALCHART_NAMESPACE::QChart::AnimationOptions)
             #endif

src/qchartview.cpp +8 0

             #include "qchartview.h"
             #include "qchart.h"
             #include "qchartaxis.h"
             #include <QGraphicsView>
             #include <QGraphicsScene>
             #include <QRubberBand>
             #include <QResizeEvent>
             #include <QDebug>
             /*!
                 \enum QChartView::RubberBandPolicy
                 This enum describes the different types of rubber bands that can be used for zoom rect selection
                 \value NoRubberBand
                 \value VerticalRubberBand
                 \value HorizonalRubberBand
                 \value RectangleRubberBand
             */
             /*!
                 \class QChartView
                 \brief Standalone charting widget.
                 QChartView is a standalone widget that can display charts. It does not require separate
                 QGraphicsScene to work. It manages the graphical representation of different types of
                 QChartSeries and other chart related objects like QChartAxis and QChartLegend. If you want to
                 display a chart in your existing QGraphicsScene, you can use the QChart class instead.
                 \sa QChart
             */
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 Constructs a chartView object which is a child of a\a parent.
             */
             QChartView::QChartView(QWidget *parent) :
             QGraphicsView(parent),
             m_scene(new QGraphicsScene(this)),
             m_chart(new QChart()),
             m_rubberBand(0),
             m_verticalRubberBand(false),
             m_horizonalRubberBand(false)
             {
                 setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
                 setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
                 setScene(m_scene);
                 m_chart->setMargin(50);
                 m_scene->addItem(m_chart);
                 setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
             }
             /*!
                 Destroys the object and it's children, like QChartSeries and QChartAxis object added to it.
             */
             QChartView::~QChartView()
             {
             }
             /*!
                 Resizes and updates the chart area using the \a event data
             */
             void QChartView::resizeEvent(QResizeEvent *event)
             {
                 m_scene->setSceneRect(0,0,size().width(),size().height());
                 m_chart->resize(size());
                 QWidget::resizeEvent(event);
             }
             /*!
                 Adds the \a series and optional \a axisY onto the chart and takes the ownership of the objects.
                 If auto scaling is enabled, re-scales the axes the series is bound to (both the x axis and
                 the y axis).
                 \sa removeSeries(), removeAllSeries()
             */
             void QChartView::addSeries(QSeries* series,QChartAxis *axisY)
             {
                 m_chart->addSeries(series,axisY);
             }
             /*!
                 Removes the \a series specified in a perameter from the QChartView.
                 It releses its ownership of the specified QChartSeries object.
                 It does not delete the pointed QChartSeries data object
                 \sa addSeries(), removeAllSeries()
             */
             void QChartView::removeSeries(QSeries* series)
             {
                 m_chart->removeSeries(series);
             }
             /*!
                 Removes all the QChartSeries that have been added to the QChartView
                 It also deletes the pointed QChartSeries data objects
                 \sa addSeries(), removeSeries()
             */
             void QChartView::removeAllSeries()
             {
                 m_chart->removeAllSeries();
             }
             /*!
                 Zooms in the view by a factor of 2
             */
             void QChartView::zoomIn()
             {
                 m_chart->zoomIn();
             }
             /*!
                 Zooms in the view to a maximum level at which \a rect is still fully visible.
             */
             void QChartView::zoomIn(const QRect& rect)
             {
                 m_chart->zoomIn(rect);
             }
             /*!
                 Restores the view zoom level to the previous one.
             */
             void QChartView::zoomOut()
             {
                 m_chart->zoomOut();
             }
             /*!
                 Returns the chart margin, which is the distance between the widget edge and the part of the chart where the actual data can be displayed.
             */
             int QChartView::margin() const
             {
                 return m_chart->margin();
             }
             /*!
                 Sets the chart \a title. A description text that is rendered above the chart.
             */
             void QChartView::setChartTitle(const QString& title)
             {
                 m_chart->setChartTitle(title);
             }
             /*!
+                Gets the chart \a title. A description text that is rendered above the chart.
+            */
+            QString QChartView::chartTitle() const
+            {
+                return m_chart->chartTitle();
+            }
+            /*!
                 Sets the \a font that is used for rendering the description text that is rendered above the chart.
             */
             void QChartView::setChartTitleFont(const QFont& font)
             {
                 m_chart->setChartTitleFont(font);
             }
             /*!
                 Sets the \a brush that is used for painting the background of the chart area of the QChartView widget.
             */
             void QChartView::setChartBackgroundBrush(const QBrush& brush)
             {
                 m_chart->setChartBackgroundBrush(brush);
             }
             /*!
                 Sets the \a pen that is used for painting the background of the chart area of the QChartView widget.
             */
             void QChartView::setChartBackgroundPen(const QPen& pen)
             {
                 m_chart->setChartBackgroundPen(pen);
             }
             /*!
                 Sets the RubberBandPlicy to \a policy. Selected policy determines the way zooming is performed.
             */
             void QChartView::setRubberBandPolicy(const RubberBandPolicy policy)
             {
                 switch(policy) {
                     case VerticalRubberBand:
                     m_verticalRubberBand = true;
                     m_horizonalRubberBand = false;
                     break;
                     case HorizonalRubberBand:
                     m_verticalRubberBand = false;
                     m_horizonalRubberBand = true;
                     break;
                     case RectangleRubberBand:
                     m_verticalRubberBand = true;
                     m_horizonalRubberBand = true;
                     break;
                     case NoRubberBand:
                     default:
                     delete m_rubberBand;
                     m_rubberBand=0;
                     m_horizonalRubberBand = false;
                     m_verticalRubberBand = false;
                     return;
                 }
                 if(!m_rubberBand) {
                     m_rubberBand = new QRubberBand(QRubberBand::Rectangle, this);
                     m_rubberBand->setEnabled(true);
                 }
             }
             /*!
                 Returns the RubberBandPolicy that is currently being used by the widget.
             */
             QChartView::RubberBandPolicy QChartView::rubberBandPolicy() const
             {
                 if(m_horizonalRubberBand && m_verticalRubberBand) return RectangleRubberBand;
                 if(m_horizonalRubberBand) return HorizonalRubberBand;
                 if(m_verticalRubberBand) return VerticalRubberBand;
                 return NoRubberBand;
             }
             /*!
                 If Left mouse button is pressed and the RubberBandPolicy is enabled the \a event is accepted and the rubber band is displayed on the screen allowing the user to select the zoom area.
                 If different mouse button is pressed and/or the RubberBandPolicy is disabled then the \a event is passed to QGraphicsView::mousePressEvent() implementation.
             */
             void QChartView::mousePressEvent(QMouseEvent *event)
             {
                 if(m_rubberBand && m_rubberBand->isEnabled() && event->button() == Qt::LeftButton) {
                     int margin = m_chart->margin();
                     QRect rect(margin, margin, width() - 2 * margin, height() - 2 * margin);
                     if (rect.contains(event->pos())) {
                         m_rubberBandOrigin = event->pos();
                         m_rubberBand->setGeometry(QRect(m_rubberBandOrigin, QSize()));
                         m_rubberBand->show();
                         event->accept();
                     }
                 }
                 else {
                     QGraphicsView::mousePressEvent(event);
                 }
             }
             /*!
                 If RubberBand rectange specification has been initiated in pressEvent then \a event data is used to update RubberBand geometry.
                 In other case the defualt QGraphicsView::mouseMoveEvent implementation is called.
             */
             void QChartView::mouseMoveEvent(QMouseEvent *event)
             {
                 if(m_rubberBand && m_rubberBand->isVisible()) {
                     int margin = m_chart->margin();
                     QRect rect(margin, margin, width() - 2 * margin, height() - 2 * margin);
                     int width = event->pos().x() - m_rubberBandOrigin.x();
                     int height = event->pos().y() - m_rubberBandOrigin.y();
                     if(!m_verticalRubberBand) {
                         m_rubberBandOrigin.setY(rect.top());
                         height = rect.height();
                     }
                     if(!m_horizonalRubberBand) {
                         m_rubberBandOrigin.setX(rect.left());
                         width= rect.width();
                     }
                     m_rubberBand->setGeometry(QRect(m_rubberBandOrigin.x(),m_rubberBandOrigin.y(), width,height).normalized());
                 }
                 else {
                     QGraphicsView::mouseMoveEvent(event);
                 }
             }
             /*!
                 If left mouse button is release and RubberBand is enabled then \a event is accepted and the view is zoomed in to rect specified by RubberBand
                 If it is the right mouse button \a event then RubberBand is dissmissed and zoom is canceled.
             */
             void QChartView::mouseReleaseEvent(QMouseEvent *event)
             {
                 if(m_rubberBand) {
                     if (event->button() == Qt::LeftButton && m_rubberBand->isVisible()) {
                         m_rubberBand->hide();
                         QRect rect = m_rubberBand->geometry();
                         m_chart->zoomIn(rect);
                         event->accept();
                     }
                     if(event->button()==Qt::RightButton)
                     m_chart->zoomReset();
                 }
                 else {
                     QGraphicsView::mouseReleaseEvent(event);
                 }
             }
             /*!
                 Pressing + and - keys performs zoomIn() and zoomOut() respectivly.
                 In other \a event is passed to the QGraphicsView::keyPressEvent() implementation
             */
             void QChartView::keyPressEvent(QKeyEvent *event)
             {
                 switch (event->key()) {
                     case Qt::Key_Plus:
                     zoomIn();
                     break;
                     case Qt::Key_Minus:
                     zoomOut();
                     break;
                     default:
                     QGraphicsView::keyPressEvent(event);
                     break;
                 }
             }
             /*!
                 Sets the \a theme used by the chart for rendering the graphical representation of the data
                 \sa QChart::ChartTheme, chartTheme()
             */
             void QChartView::setChartTheme(QChart::ChartTheme theme)
             {
                 m_chart->setChartTheme(theme);
             }
             /*!
                 Returns the theme enum used by the chart.
                 \sa setChartTheme()
             */
             QChart::ChartTheme QChartView::chartTheme() const
             {
                 return m_chart->chartTheme();
             }
             /*!
                 Returns the pointer to the x axis object of the chart
             */
             QChartAxis* QChartView::axisX() const
             {
                 return m_chart->axisX();
             }
             /*!
                 Returns the pointer to the y axis object of the chart
             */
             QChartAxis* QChartView::axisY() const
             {
                 return m_chart->axisY();
             }
             /*!
                 Sets animation \a options for the chart
             */
             void QChartView::setAnimationOptions(QChart::AnimationOptions options)
             {
                 m_chart->setAnimationOptions(options);
             }
             /*!
                 Returns animation options for the chart
             */
             QChart::AnimationOptions QChartView::animationOptions() const
             {
                 return m_chart->animationOptions();
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchartview.h +1 0

             #ifndef QCHARTWIDGET_H
             #define QCHARTWIDGET_H
             #include "qchartglobal.h"
             #include "qseries.h"
             #include "qchart.h"
             #include <QGraphicsView>
             class QGraphicsScene;
             class QRubberBand;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChart;
             class QTCOMMERCIALCHART_EXPORT QChartView : public QGraphicsView
             {
             public:
                 enum  RubberBandPolicy { NoRubberBand, VerticalRubberBand, HorizonalRubberBand, RectangleRubberBand };
                 explicit QChartView(QWidget *parent = 0);
                 ~QChartView();
                 //implement from QWidget
                 void resizeEvent(QResizeEvent *event);
                 void addSeries(QSeries* series,QChartAxis* axisY=0);// takes series ownership , takes axis ownership
                 void removeSeries(QSeries* series); //returns ownership , deletes axis if no series attached
                 void removeAllSeries(); // deletes series and axis
                 int margin() const;
                 void setChartTitle(const QString& title);
+                QString chartTitle() const;
                 void setChartTitleFont(const QFont& font);
                 void setChartBackgroundBrush(const QBrush& brush);
                 void setChartBackgroundPen(const QPen& pen);
                 void zoomIn();
                 void zoomIn(const QRect& rect);
                 void zoomOut();
                 void setRubberBandPolicy(const RubberBandPolicy );
                 RubberBandPolicy rubberBandPolicy() const;
                 void setChartTheme(QChart::ChartTheme theme);
                 QChart::ChartTheme chartTheme() const;
                 void setAnimationOptions(QChart::AnimationOptions options);
                 QChart::AnimationOptions animationOptions() const;
                 QChartAxis* axisX() const;
                 QChartAxis* axisY() const;
             protected:
                 void mousePressEvent(QMouseEvent *event);
                 void mouseMoveEvent(QMouseEvent *event);
                 void mouseReleaseEvent(QMouseEvent *event);
                 void keyPressEvent(QKeyEvent *event);
             private:
                 QGraphicsScene *m_scene;
                 QChart* m_chart;
                 QPoint m_rubberBandOrigin;
                 QRubberBand* m_rubberBand;
                 bool m_verticalRubberBand;
                 bool m_horizonalRubberBand;
                 Q_DISABLE_COPY(QChartView)
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QCHARTWIDGET_H

src/scatterseries/scatterchartitem.cpp +1 -1

             #include "scatterchartitem_p.h"
             #include "qscatterseries.h"
             #include "chartpresenter_p.h"
             #include <QPainter>
             #include <QGraphicsScene>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            ScatterChartItem::ScatterChartItem(QScatterSeries *series, QGraphicsObject *parent) :
+            ScatterChartItem::ScatterChartItem(QScatterSeries *series, QGraphicsItem *parent) :
                 XYChartItem(series,parent),
                 m_series(series),
                 m_items(this),
                 m_shape(QScatterSeries::MarkerShapeRectangle),
                 m_size(10)
             {
                 Q_ASSERT(parent);
                 Q_ASSERT(series);
                 connect(m_series,SIGNAL(updated()), this, SLOT(handleUpdated()));
                 setZValue(ChartPresenter::ScatterSeriesZValue);
                 setFlags(QGraphicsItem::ItemHasNoContents);
                 setFlags(QGraphicsItem::ItemClipsChildrenToShape);
                 handleUpdated();
                 // TODO: how to draw a drop shadow?
             //    QGraphicsDropShadowEffect *dropShadow = new QGraphicsDropShadowEffect();
             //    dropShadow->setOffset(2.0);
             //    dropShadow->setBlurRadius(2.0);
             //    setGraphicsEffect(dropShadow);
             }
             QRectF ScatterChartItem::boundingRect() const
             {
                 return m_rect;
             }
             void ScatterChartItem::createPoints(int count)
             {
                 for (int i = 0; i < count; ++i) {
                     QGraphicsItem *item;
                     switch (m_shape) {
                                case QScatterSeries::MarkerShapeDefault:
                                // Fallthrough, defaults to circle
                                case QScatterSeries::MarkerShapeCircle:
                                    item = new QGraphicsEllipseItem(0,0,m_size,m_size);
                                    break;
                                case QScatterSeries::MarkerShapeRectangle:
                                    item = new QGraphicsRectItem(0,0,m_size,m_size);
                                    break;
                                case QScatterSeries::MarkerShapeRoundedRectangle:
                                    //m_path.addRoundedRect(x, y, size, size, size / 4.0, size / 4.0);
                                    break;
                                case QScatterSeries::MarkerShapeTiltedRectangle:
                                    // TODO: tilt the rectangle
                                    //m_path.addRect(x, y, size, size);
                                    //break;
                                case QScatterSeries::MarkerShapeTriangle:
                                    //QPolygonF polygon;
                                    //polygon << QPointF(0.0, -size) << QPointF(size / 2.0, 0.0) << QPointF(-size / 2, 0.0);
                                    // TODO: the position is not exactly right...
                                    //m_path.addPolygon(polygon.translated(x + size / 2.0, y + size));
                                    break;
                     }
                     m_items.addToGroup(item);
                 }
             }
             void ScatterChartItem::deletePoints(int count)
             {
                 QList<QGraphicsItem *> items = m_items.childItems();
                 for (int i = 0; i < count; ++i) {
                     delete(items.takeLast());
                 }
             }
             /*
             void ScatterChartItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
             {
                 QPointF clickedPoint(
                     m_minX + (event->lastPos().x() / m_clippingRect.width()) * (m_maxX-m_minX),
                     m_maxY - (event->lastPos().y() / m_clippingRect.height()) * (m_maxY-m_minY));
                 emit clicked(clickedPoint);
             }
             */
             void ScatterChartItem::setGeometry(QVector<QPointF>& points)
             {
                 if(points.size()==0) return;
                 int diff = XYChartItem::points().size() - points.size();
                 if(diff>0) {
                     deletePoints(diff);
                 }
                 else if(diff<0) {
                     createPoints(-diff);
                 }
                 if(diff!=0) handleUpdated();
                 QList<QGraphicsItem*> items = m_items.childItems();
                 for(int i=0; i< points.size();i++) {
                     QGraphicsItem* item = items.at(i);
                     const QPointF& point = points.at(i);
                     item->setPos(point.x()-1,point.y()-1);
                     if(!clipRect().contains(point)) {
                         item->setVisible(false);
                     }
                     else {
                         item->setVisible(true);
                     }
                 }
                 prepareGeometryChange();
                 m_rect = clipRect();
                 XYChartItem::setGeometry(points);
             }
             void ScatterChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 Q_UNUSED(painter);
                 Q_UNUSED(option);
                 Q_UNUSED(widget);
             }
             void ScatterChartItem::setPen(const QPen& pen)
             {
                 foreach(QGraphicsItem* item , m_items.childItems()) {
                        static_cast<QAbstractGraphicsShapeItem*>(item)->setPen(pen);
                 }
             }
             void ScatterChartItem::setBrush(const QBrush& brush)
             {
                 foreach(QGraphicsItem* item , m_items.childItems()) {
                         static_cast<QAbstractGraphicsShapeItem*>(item)->setBrush(brush);
                  }
             }
             void ScatterChartItem::handleUpdated()
             {
                 int count = m_items.childItems().count();
                 if(count==0) return;
                 bool recreate = m_size != m_series->size() || m_shape != m_series->shape();
                 //TODO: only rewrite on size change
                 m_size = m_series->size();
                 m_shape = m_series->shape();
                 if(recreate){
                     deletePoints(count);
                     createPoints(count);
                 }
                 setPen(m_series->pen());
                 setBrush(m_series->brush());
             }
             #include "moc_scatterchartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/scatterseries/scatterchartitem_p.h +7 -2

             #ifndef SCATTERPRESENTER_H
             #define SCATTERPRESENTER_H
             #include "qchartglobal.h"
             #include "xychartitem_p.h"
-            #include <QObject>
+            #include "xychartanimationitem_p.h"
+            #include <QGraphicsItem>
             #include <QPen>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QScatterSeries;
             class ScatterChartItem : public XYChartItem
             {
                 Q_OBJECT
             public:
-                explicit ScatterChartItem(QScatterSeries *series, QGraphicsObject *parent = 0);
+                explicit ScatterChartItem(QScatterSeries *series, QGraphicsItem *parent = 0);
             public:
                 //from QGraphicsItem
                 QRectF boundingRect() const;
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
                 void setPen(const QPen& pen);
                 void setBrush(const QBrush& brush);
             signals:
                 void clicked(QPointF coordinates);
             public slots:
                 void handleUpdated();
             private:
                 void createPoints(int count);
                 void deletePoints(int count);
             protected:
                 virtual void setGeometry(QVector<QPointF>& points);
             private:
                 QScatterSeries *m_series;
                 QGraphicsItemGroup m_items;
                 int m_shape;
                 int m_size;
                 QRectF m_rect;
+                template<class,class> friend class XYChartAnimator;
             };
+            typedef XYChartAnimationItem<ScatterChartItem,QScatterSeries> ScatterChartAnimationItem;
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // SCATTERPRESENTER_H

src/splinechart/splinechartitem.cpp +21 -2

             #include "splinechartitem_p.h"
+            #include "chartpresenter_p.h"
             #include <QPainter>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            SplineChartItem::SplineChartItem(QSplineSeries* series, QGraphicsObject *parent) :
+            SplineChartItem::SplineChartItem(QSplineSeries* series, QGraphicsItem *parent) :
             XYChartItem(series, parent),
             m_series(series)
             {
+                setZValue(ChartPresenter::LineChartZValue);
+                QObject::connect(series,SIGNAL(updated()),this,SLOT(handleUpdated()));
+                handleUpdated();
             }
             QRectF SplineChartItem::boundingRect() const
             {
                 return m_rect;
             }
             QPainterPath SplineChartItem::shape() const
             {
                 return m_path;
             }
             QPointF SplineChartItem::calculateGeometryControlPoint(int index) const
             {
                 return XYChartItem::calculateGeometryPoint(m_series->controlPoint(index));
             }
             void SplineChartItem::setGeometry(QVector<QPointF>& points)
             {
                 if(points.size()==0) return;
                 QPainterPath splinePath;
                 const QPointF& point = points.at(0);
                 splinePath.moveTo(point);
                 for (int i = 0; i < points.size() - 1; i++)
                 {
                     const QPointF& point = points.at(i + 1);
                     splinePath.cubicTo(calculateGeometryControlPoint(2 * i), calculateGeometryControlPoint(2 * i + 1), point);
                 }
                 prepareGeometryChange();
                 m_path = splinePath;
                 m_rect = splinePath.boundingRect();
                 XYChartItem::setGeometry(points);
             }
-            void SplineChartItem::setPen(const QPen& pen)
+            void SplineChartItem::setLinePen(const QPen& pen)
             {
                 m_pen = pen;
+                qDebug()<<pen;
             }
+            //handlers
+            void SplineChartItem::handleUpdated()
+            {
+                //m_items.setVisible(m_series->pointsVisible());
+                setLinePen(m_series->pen());
+                update();
+            }
+            //painter
             void SplineChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 Q_UNUSED(widget);
                 Q_UNUSED(option);
                 painter->save();
                 painter->setClipRect(clipRect());
+                painter->setPen(m_pen);
                 painter->drawPath(m_path);
                 const QVector<QPointF> points =  XYChartItem::points();
                 for (int i = 0; i < points.size() - 1; i++)
                 {
                     painter->setPen(Qt::red);
                     painter->drawEllipse(points[i], 2, 2);
                     painter->setPen(Qt::blue);
                     //        painter->drawLine(m_series->at(i), m_series->controlPoint(2 * i));
                     //        painter->drawLine(m_series->at(i + 1), m_series->controlPoint(2 * i + 1));
                     //        painter->drawEllipse(calculateGeometryControlPoint(2 * i), 4, 4);
                     //        painter->drawEllipse(calculateGeometryControlPoint(2 * i + 1), 4, 4);
                 }
                 if (points.count() > 0)
                 {
                     painter->setPen(Qt::red);
                     painter->drawEllipse(points[points.count() - 1], 2, 2);
                 }
                 painter->restore();
             }
             #include "moc_splinechartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/splinechart/splinechartitem_p.h +11 -4

             #ifndef SPLINECHARTITEM_P_H
             #define SPLINECHARTITEM_P_H
-            #include "chartitem_p.h"
-            #include <QObject>
             #include "qsplineseries.h"
             #include "xychartitem_p.h"
+            #include "xychartanimationitem_p.h"
+            #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class SplineChartItem : public XYChartItem
             {
                 Q_OBJECT
             public:
-                SplineChartItem(QSplineSeries* series, QGraphicsObject *parent = 0);
+                SplineChartItem(QSplineSeries* series, QGraphicsItem *parent = 0);
                 //from QGraphicsItem
                 QRectF boundingRect() const;
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
                 QPainterPath shape() const;
-                void setPen(const QPen& pen);
+                void setLinePen(const QPen& pen);
                 void setPointsVisible(bool visible);
+            public slots:
+                void handleUpdated();
             protected:
                 void setGeometry(QVector<QPointF>& points);
             private:
                 QPointF calculateGeometryControlPoint(int index) const;
             private:
                 QSplineSeries* m_series;
                 QPainterPath m_path;
                 QRectF m_rect;
                 QPen m_pen;
+                template<class,class> friend class XYChartAnimator;
             };
+            typedef XYChartAnimationItem<SplineChartItem,QSplineSeries> SplineChartAnimationItem;
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // SPLINECHARTITEM_P_H

src/xychart/xychart.pri +2 0

             INCLUDEPATH += $$PWD
             DEPENDPATH += $$PWD
             SOURCES += \
                 $$PWD/xychartitem.cpp \
                 $$PWD/qxyseries.cpp
             PRIVATE_HEADERS += \
                 $$PWD/xychartitem_p.h \
+                $$PWD/xychartanimationitem_p.h \
+                $$PWD/xychartanimator_p.h
             PUBLIC_HEADERS += \
                 $$PWD/qxyseries.h

src/xychart/xychartitem.cpp +5 -6

             #include "xychartitem_p.h"
             #include "qxyseries.h"
             #include "chartpresenter_p.h"
             #include <QPainter>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             //TODO: optimize : remove points which are not visible
             XYChartItem::XYChartItem(QXYSeries* series,QGraphicsItem *parent):ChartItem(parent),
             m_minX(0),
             m_maxX(0),
             m_minY(0),
             m_maxY(0),
             m_series(series)
             {
                 QObject::connect(series,SIGNAL(pointReplaced(int)),this,SLOT(handlePointReplaced(int)));
                 QObject::connect(series,SIGNAL(pointAdded(int)),this,SLOT(handlePointAdded(int)));
                 QObject::connect(series,SIGNAL(pointRemoved(int)),this,SLOT(handlePointRemoved(int)));
             }
             QPointF XYChartItem::calculateGeometryPoint(const QPointF& point) const
             {
                 const qreal deltaX = m_size.width()/(m_maxX-m_minX);
                 const qreal deltaY = m_size.height()/(m_maxY-m_minY);
                 qreal x = (point.x() - m_minX)* deltaX;
                 qreal y = (point.y() - m_minY)*-deltaY + m_size.height();
                 return QPointF(x,y);
             }
             QPointF XYChartItem::calculateGeometryPoint(int index) const
             {
                 const qreal deltaX = m_size.width()/(m_maxX-m_minX);
                 const qreal deltaY = m_size.height()/(m_maxY-m_minY);
                 qreal x = (m_series->x(index) - m_minX)* deltaX;
                 qreal y = (m_series->y(index) - m_minY)*-deltaY + m_size.height();
                 return QPointF(x,y);
             }
             QVector<QPointF> XYChartItem::calculateGeometryPoints() const
             {
                 const qreal deltaX = m_size.width()/(m_maxX-m_minX);
                 const qreal deltaY = m_size.height()/(m_maxY-m_minY);
                 QVector<QPointF> points;
                 points.reserve(m_series->count());
                 for (int i = 0; i < m_series->count(); ++i) {
                   qreal x = (m_series->x(i) - m_minX)* deltaX;
                   qreal y = (m_series->y(i) - m_minY)*-deltaY + m_size.height();
                   points << QPointF(x,y);
                 }
                 return points;
             }
             void XYChartItem::updatePoints(QVector<QPointF>& points)
             {
                 setGeometry(points);
             }
-            void XYChartItem::updatePoint(int index,QPointF& newPoint)
+            void XYChartItem::updatePoint(QVector<QPointF>& points)
             {
-            	m_points.replace(index,newPoint);
+                setGeometry(points);
-            	setGeometry(m_points);
             }
             void XYChartItem::setGeometry(QVector<QPointF>& points)
             {
                 m_points = points;
             }
             //handlers
             void XYChartItem::handlePointAdded(int index)
             {
                 Q_ASSERT(index<m_series->count());
                 Q_ASSERT(index>=0);
                 QPointF point = calculateGeometryPoint(index);
                 QVector<QPointF> points = m_points;
                 points.insert(index,point);
                 updatePoints(points);
                 update();
             }
             void XYChartItem::handlePointRemoved(int index)
             {
                 Q_ASSERT(index<m_series->count());
                 Q_ASSERT(index>=0);
                 QPointF point = calculateGeometryPoint(index);
                 QVector<QPointF> points = m_points;
                 points.remove(index);
                 updatePoints(points);
                 update();
             }
             void XYChartItem::handlePointReplaced(int index)
             {
                 Q_ASSERT(index<m_series->count());
                 Q_ASSERT(index>=0);
                 QPointF point = calculateGeometryPoint(index);
-                updatePoint(index,point);
+                QVector<QPointF> points = m_points;
+                m_points.replace(index,point);
+                updatePoint(points);
                 update();
             }
             void XYChartItem::handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY)
             {
                 m_minX=minX;
                 m_maxX=maxX;
                 m_minY=minY;
                 m_maxY=maxY;
                 if(isEmpty()) return;
                 QVector<QPointF> points = calculateGeometryPoints();
                 updatePoints(points);
                 update();
             }
             void XYChartItem::handleGeometryChanged(const QRectF& rect)
             {
             	Q_ASSERT(rect.isValid());
             	m_size=rect.size();
             	m_clipRect=rect.translated(-rect.topLeft());
             	setPos(rect.topLeft());
             	if(isEmpty()) return;
             	QVector<QPointF> points = calculateGeometryPoints();
             	updatePoints(points);
             	update();
             }
             bool XYChartItem::isEmpty()
             {
                return !m_clipRect.isValid() ||  m_maxX - m_minX == 0 || m_maxY - m_minY ==0 ;
             }
             #include "moc_xychartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/xychart/xychartitem_p.h +4 -1

             #ifndef XYCHARTITEM_H
             #define XYCHARTITEM_H
             #include "qchartglobal.h"
             #include "chartitem_p.h"
             #include <QPen>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartPresenter;
             class QXYSeries;
             class XYChartItem :  public QObject , public ChartItem
             {
                  Q_OBJECT
             public:
                  explicit XYChartItem(QXYSeries* series,QGraphicsItem *parent = 0);
                 ~ XYChartItem(){};
                 QVector<QPointF> points() const {return m_points;}
                 QRectF clipRect() const { return m_clipRect;}
             public slots:
                 void handlePointAdded(int index);
                 void handlePointRemoved(int index);
                 void handlePointReplaced(int index);
                 void handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY);
                 void handleGeometryChanged(const QRectF& size);
             protected:
                 virtual void updatePoints(QVector<QPointF>& points);
-                virtual void updatePoint(int index,QPointF& newPoint);
+                virtual void updatePoint(QVector<QPointF>& points);
                 virtual void setGeometry(QVector<QPointF>& points);
                 QPointF calculateGeometryPoint(const QPointF& point) const;
                 QPointF calculateGeometryPoint(int index) const;
                 QVector<QPointF> calculateGeometryPoints() const;
             private:
                 inline bool isEmpty();
             private:
                 qreal m_minX;
                 qreal m_maxX;
                 qreal m_minY;
                 qreal m_maxY;
                 QXYSeries* m_series;
                 QSizeF m_size;
                 QRectF m_clipRect;
                 QVector<QPointF> m_points;
+                template<class,class> friend class XYChartAnimator;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

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