HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2316:74962bdcee07

0

src/animations/animations.pri +2 -14

@@ -7,13 +7,7 SOURCES += \
7	$$PWD/pieanimation.cpp \	7	$$PWD/pieanimation.cpp \
8	$$PWD/piesliceanimation.cpp \	8	$$PWD/piesliceanimation.cpp \
9	$$PWD/splineanimation.cpp \	9	$$PWD/splineanimation.cpp \
10	$$PWD/baranimation.cpp \	10	$$PWD/baranimation.cpp
11	$$PWD/stackedbaranimation.cpp \
12	$$PWD/percentbaranimation.cpp \
13	$$PWD/abstractbaranimation.cpp \
14	$$PWD/horizontalbaranimation.cpp \
15	$$PWD/horizontalstackedbaranimation.cpp \
16	$$PWD/horizontalpercentbaranimation.cpp
17		11
18	PRIVATE_HEADERS += \	12	PRIVATE_HEADERS += \
19	$$PWD/axisanimation_p.h \	13	$$PWD/axisanimation_p.h \
@@ -22,10 +16,4 PRIVATE_HEADERS += \
22	$$PWD/pieanimation_p.h \	16	$$PWD/pieanimation_p.h \
23	$$PWD/piesliceanimation_p.h \	17	$$PWD/piesliceanimation_p.h \
24	$$PWD/splineanimation_p.h \	18	$$PWD/splineanimation_p.h \
25	$$PWD/baranimation_p.h \	19	$$PWD/baranimation_p.h
26	$$PWD/stackedbaranimation_p.h \
27	$$PWD/percentbaranimation_p.h \
28	$$PWD/abstractbaranimation_p.h \
29	$$PWD/horizontalbaranimation_p.h \
30	$$PWD/horizontalstackedbaranimation_p.h \
31	$$PWD/horizontalpercentbaranimation_p.h

0

src/animations/baranimation.cpp +24 -17

@@ -27,9 +27,11 Q_DECLARE_METATYPE(QVector<QRectF>)
27	QTCOMMERCIALCHART_BEGIN_NAMESPACE	27	QTCOMMERCIALCHART_BEGIN_NAMESPACE
28		28
29	BarAnimation::BarAnimation(AbstractBarChartItem *item)	29	BarAnimation::BarAnimation(AbstractBarChartItem *item)
30	: ~~AbstractBar~~Animation(item)	30	: ChartAnimation(item),
		31	m_item(item)
31	{	32	{
32		33	setDuration(ChartAnimationDuration);
		34	setEasingCurve(QEasingCurve::OutQuart);
33	}	35	}
34		36
35	BarAnimation::~BarAnimation()	37	BarAnimation::~BarAnimation()
@@ -47,27 +49,32 QVariant BarAnimation::interpolated(const QVariant &from, const QVariant &to, qr
47	for (int i = 0; i < startVector.count(); i++) {	49	for (int i = 0; i < startVector.count(); i++) {
48	QRectF start = startVector[i].normalized();	50	QRectF start = startVector[i].normalized();
49	QRectF end = endVector[i].normalized();	51	QRectF end = endVector[i].normalized();
		52	qreal x1 = start.left() + progress * (end.left() - start.left());
		53	qreal x2 = start.right() + progress * (end.right() - start.right());
		54	qreal y1 = start.top() + progress * (end.top() - start.top());
		55	qreal y2 = start.bottom() + progress * (end.bottom() - start.bottom());
50		56
51	qreal x = end.left();	57	QRectF value(QPointF(x1, y1), QPointF(x2, y2));
52	qreal y;
53	qreal w = end.width();
54	qreal h;
55
56	if (endVector[i].height() < 0) {
57	// Negative bar
58	y = end.top();
59	h = start.height() + ((end.height() - start.height()) * progress);
60	} else {
61	h = startVector[i].height() + ((endVector[i].height() - startVector[i].height()) * progress);
62	y = endVector[i].top() + endVector[i].height() - h;
63	}
64
65	QRectF value(x, y, w, h);
66	result << value.normalized();	58	result << value.normalized();
67	}	59	}
68	return qVariantFromValue(result);	60	return qVariantFromValue(result);
69	}	61	}
70		62
		63	void BarAnimation::updateCurrentValue(const QVariant &value)
		64	{
		65	QVector<QRectF> layout = qvariant_cast<QVector<QRectF> >(value);
		66	m_item->setLayout(layout);
		67	}
		68
		69	void BarAnimation::setup(const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout)
		70	{
		71	QVariantAnimation::KeyValues value;
		72	setKeyValues(value); //workaround for wrong interpolation call
		73	setKeyValueAt(0.0, qVariantFromValue(oldLayout));
		74	setKeyValueAt(1.0, qVariantFromValue(newLayout));
		75	}
		76
71	#include "moc_baranimation_p.cpp"	77	#include "moc_baranimation_p.cpp"
72		78
73	QTCOMMERCIALCHART_END_NAMESPACE	79	QTCOMMERCIALCHART_END_NAMESPACE
		80

0

src/animations/baranimation_p.h +10 -6

             //
             // We mean it.
-            #ifndef BARANIMATION_P_H
+            #ifndef ABSTRACTBARANIMATION_P_H
-            #define BARANIMATION_P_H
+            #define ABSTRACTBARANIMATION_P_H
-            #include "abstractbaranimation_p.h"
             #include "chartanimation_p.h"
-            #include "abstractbarchartitem_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class AbstractBarChartItem;
-            class BarAnimation : public AbstractBarAnimation
+            class BarAnimation : public ChartAnimation
             {
                 Q_OBJECT
             public: // from QVariantAnimation
                 virtual QVariant interpolated(const QVariant &from, const QVariant &to, qreal progress) const;
+                virtual void updateCurrentValue(const QVariant &value);
+                void setup(const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout);
+            protected:
+                AbstractBarChartItem *m_item;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
-            #endif
+            #endif // ABSTRACTBARANIMATION_P_H

0

src/barchart/abstractbarchartitem.cpp +10 -3

             #include "qchart.h"
             #include "chartpresenter_p.h"
             #include "charttheme_p.h"
-            #include "abstractbaranimation_p.h"
+            #include "baranimation_p.h"
             #include "chartdataset_p.h"
             #include <QPainter>
             void AbstractBarChartItem::applyLayout(const QVector<QRectF> &layout)
             {
+                QSizeF size = geometry().size();
+                if (geometry().size().isValid()) {
                     if (m_animation) {
+                        if (m_layout.count() == 0 || m_oldSize != size) {
+                            initializeLayout();
+                            m_oldSize = size;
+                        }
                         m_animation->setup(m_layout, layout);
                         presenter()->startAnimation(m_animation);
                     } else {
                         update();
                     }
                 }
+            }
-            void AbstractBarChartItem::setAnimation(AbstractBarAnimation *animation)
+            void AbstractBarChartItem::setAnimation(BarAnimation *animation)
             {
                 m_animation = animation;
             }
                         connect(bar, SIGNAL(hovered(bool,QBarSet*)), m_series, SIGNAL(hovered(bool,QBarSet*)));
                         connect(bar, SIGNAL(clicked(int,QBarSet*)), set, SIGNAL(clicked(int)));
                         connect(bar, SIGNAL(hovered(bool,QBarSet*)), set, SIGNAL(hovered(bool)));
-                        m_layout.append(QRectF(0, 0, 0, 0));
+                        //            m_layout.append(QRectF(0, 0, 1, 1));
                         // Labels
                         m_labels.append(new QGraphicsSimpleTextItem(this));

0

src/barchart/abstractbarchartitem_p.h +5 -3

             class Bar;
             class QAxisCategories;
             class QChart;
-            class AbstractBarAnimation;
+            class BarAnimation;
             class AbstractBarChartItem : public ChartItem
             {
                 QRectF boundingRect() const;
                 virtual QVector<QRectF> calculateLayout() = 0;
+                virtual void initializeLayout() = 0;
                 virtual void applyLayout(const QVector<QRectF> &layout);
-                virtual void setAnimation(AbstractBarAnimation *animation);
+                virtual void setAnimation(BarAnimation *animation);
                 void setLayout(const QVector<QRectF> &layout);
                 void updateLayout(const QVector<QRectF> &layout);
                 QRectF geometry() const { return m_rect;}
                 QRectF m_rect;
                 QVector<QRectF> m_layout;
-                AbstractBarAnimation *m_animation;
+                BarAnimation *m_animation;
                 QAbstractBarSeries *m_series; // Not owned.
                 QList<Bar *> m_bars;
                 QList<QGraphicsSimpleTextItem *> m_labels;
+                QSizeF m_oldSize;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

0

src/barchart/horizontal/bar/horizontalbarchartitem.cpp +31 -11

@@ -30,6 +30,33 HorizontalBarChartItem::HorizontalBarChartItem(QAbstractBarSeries *series, QGrap
30	{	30	{
31	}	31	}
32		32
		33	void HorizontalBarChartItem::initializeLayout()
		34	{
		35	qreal categoryCount = m_series->d_func()->categoryCount();
		36	qreal setCount = m_series->count();
		37	qreal barWidth = m_series->d_func()->barWidth();
		38
		39	m_layout.clear();
		40	for(int category = 0; category < categoryCount; category++) {
		41	for (int set = 0; set < setCount; set++) {
		42	QRectF rect;
		43	QPointF topLeft;
		44	QPointF bottomRight;
		45	if (domain()->type() == AbstractDomain::LogXYDomain \|\| domain()->type() == AbstractDomain::LogXLogYDomain) {
		46	topLeft = domain()->calculateGeometryPoint(QPointF(domain()->minX(), category - barWidth / 2 + set/setCount * barWidth));
		47	bottomRight = domain()->calculateGeometryPoint(QPointF(domain()->minX(), category + barWidth / 2 + (set + 1)/setCount * barWidth));
		48	} else {
		49	topLeft = domain()->calculateGeometryPoint(QPointF(0, category - barWidth / 2 + set/setCount * barWidth));
		50	bottomRight = domain()->calculateGeometryPoint(QPointF(0, category - barWidth / 2 + (set + 1)/setCount * barWidth));
		51	}
		52
		53	rect.setTopLeft(topLeft);
		54	rect.setBottomRight(bottomRight);
		55	m_layout.append(rect.normalized());
		56	}
		57	}
		58	}
		59
33	QVector<QRectF> HorizontalBarChartItem::calculateLayout()	60	QVector<QRectF> HorizontalBarChartItem::calculateLayout()
34	{	61	{
35	QVector<QRectF> layout;	62	QVector<QRectF> layout;
@@ -39,27 +66,20 QVector<QRectF> HorizontalBarChartItem::calculateLayout()
39	qreal setCount = m_series->count();	66	qreal setCount = m_series->count();
40	qreal barWidth = m_series->d_func()->barWidth();	67	qreal barWidth = m_series->d_func()->barWidth();
41		68
42	int itemIndex(0);
43	for(int category = 0; category < categoryCount; category++) {	69	for(int category = 0; category < categoryCount; category++) {
44	for (int set = 0; set < setCount; set++) {	70	for (int set = 0; set < setCount; set++) {
45	qreal value = m_series->barSets().at(set)->at(category);	71	qreal value = m_series->barSets().at(set)->at(category);
46	QRectF rect;	72	QRectF rect;
47	QPointF topLeft;	73	QPointF topLeft;
48	if (domain()->type() == AbstractDomain::LogXYDomain \|\| domain()->type() == AbstractDomain::LogXLogYDomain)	74	if (domain()->type() == AbstractDomain::LogXYDomain \|\| domain()->type() == AbstractDomain::LogXLogYDomain)
49	topLeft = domain()->calculateGeometryPoint(QPointF(domain()->minX(), category - barWidth / 2 + (set + 1)/(setCount) * barWidth));	75	topLeft = domain()->calculateGeometryPoint(QPointF(domain()->minX(), category - barWidth / 2 + set/setCount * barWidth));
50	else	76	else
51	topLeft = domain()->calculateGeometryPoint(QPointF(0, category - barWidth / 2 + (set + 1)/(setCount) * barWidth));	77	topLeft = domain()->calculateGeometryPoint(QPointF(0, category - barWidth / 2 + set/setCount * barWidth));
52		78
53	QPointF bottomRight = domain()->calculateGeometryPoint(QPointF(value, category - barWidth / 2 + (set)/(setCount) * barWidth));	79	QPointF bottomRight = domain()->calculateGeometryPoint(QPointF(value, category - barWidth / 2 + (set + 1)/setCount * barWidth));
54	rect.setTopLeft(topLeft);	80	rect.setTopLeft(topLeft);
55	rect.setBottomRight(bottomRight);	81	rect.setBottomRight(bottomRight);
56	layout.append(rect);	82	layout.append(rect.normalized());
57
58	QGraphicsSimpleTextItem *label = m_labels.at(itemIndex);
59	label->setPos(rect.center() - label->boundingRect().center());
60	label->setZValue(200);
61	itemIndex++;
62	label->setBrush(Qt::black);
63	}	83	}
64	}	84	}
65	return layout;	85	return layout;

0

src/barchart/horizontal/bar/horizontalbarchartitem_p.h +1 0

             private:
                 virtual QVector<QRectF> calculateLayout();
+                void initializeLayout();
             };
             QTCOMMERCIALCHART_END_NAMESPACE

0

src/barchart/horizontal/bar/qhorizontalbarseries.cpp 0 -13

             #include "qhorizontalbarseries.h"
             #include "qhorizontalbarseries_p.h"
             #include "horizontalbarchartitem_p.h"
-            #include "horizontalbaranimation_p.h"
             #include "qbarcategoryaxis.h"
             #include "chartdataset_p.h"
                 QAbstractSeriesPrivate::initializeGraphics(parent);
             }
-            void QHorizontalBarSeriesPrivate::initializeAnimations(QtCommercialChart::QChart::AnimationOptions options)
-                HorizontalBarChartItem *bar = static_cast<HorizontalBarChartItem *>(m_item.data());
-                Q_ASSERT(bar);
-                if (options.testFlag(QChart::SeriesAnimations)) {
-                    bar->setAnimation(new HorizontalBarAnimation(bar));
-                }else{
-                    bar->setAnimation(0);
-                QAbstractSeriesPrivate::initializeAnimations(options);
             #include "moc_qhorizontalbarseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

0

src/barchart/horizontal/bar/qhorizontalbarseries_p.h 0 -1

             public:
                 QHorizontalBarSeriesPrivate(QHorizontalBarSeries *q);
                 void initializeGraphics(QGraphicsItem* parent);
-                void initializeAnimations(QtCommercialChart::QChart::AnimationOptions options);
                 void initializeDomain();
             private:
                 Q_DECLARE_PUBLIC(QHorizontalBarSeries)

0

src/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp +31 -4

@@ -30,6 +30,33 HorizontalPercentBarChartItem::HorizontalPercentBarChartItem(QAbstractBarSeries
30	{	30	{
31	}	31	}
32		32
		33	void HorizontalPercentBarChartItem::initializeLayout()
		34	{
		35	qreal categoryCount = m_series->d_func()->categoryCount();
		36	qreal setCount = m_series->count();
		37	qreal barWidth = m_series->d_func()->barWidth();
		38
		39	m_layout.clear();
		40	for(int category = 0; category < categoryCount; category++) {
		41	for (int set = 0; set < setCount; set++) {
		42	QRectF rect;
		43	QPointF topLeft;
		44	QPointF bottomRight;
		45	if (domain()->type() == AbstractDomain::LogXYDomain \|\| domain()->type() == AbstractDomain::LogXLogYDomain) {
		46	topLeft = domain()->calculateGeometryPoint(QPointF(domain()->minX(), category - barWidth / 2));
		47	bottomRight = domain()->calculateGeometryPoint(QPointF(domain()->minX(), category + barWidth / 2));
		48	} else {
		49	topLeft = domain()->calculateGeometryPoint(QPointF(0, category - barWidth / 2));
		50	bottomRight = domain()->calculateGeometryPoint(QPointF(0, category + barWidth / 2));
		51	}
		52
		53	rect.setTopLeft(topLeft);
		54	rect.setBottomRight(bottomRight);
		55	m_layout.append(rect.normalized());
		56	}
		57	}
		58	}
		59
33	QVector<QRectF> HorizontalPercentBarChartItem::calculateLayout()	60	QVector<QRectF> HorizontalPercentBarChartItem::calculateLayout()
34	{	61	{
35	QVector<QRectF> layout;	62	QVector<QRectF> layout;
@@ -47,13 +74,13 QVector<QRectF> HorizontalPercentBarChartItem::calculateLayout()
47	QRectF rect;	74	QRectF rect;
48	QPointF topLeft;	75	QPointF topLeft;
49	if (domain()->type() == AbstractDomain::LogXYDomain \|\| domain()->type() == AbstractDomain::LogXLogYDomain)	76	if (domain()->type() == AbstractDomain::LogXYDomain \|\| domain()->type() == AbstractDomain::LogXLogYDomain)
50	topLeft = domain()->calculateGeometryPoint(QPointF(set ? 100 * sum/categorySum : domain()->minX(), category + barWidth/2));	77	topLeft = domain()->calculateGeometryPoint(QPointF(set ? 100 * sum/categorySum : domain()->minX(), category - barWidth/2));
51	else	78	else
52	topLeft = domain()->calculateGeometryPoint(QPointF(set ? 100 * sum/categorySum : 0, category + barWidth/2));	79	topLeft = domain()->calculateGeometryPoint(QPointF(set ? 100 * sum/categorySum : 0, category - barWidth/2));
53	QPointF bottomRight = domain()->calculateGeometryPoint(QPointF(100 * (value + sum)/categorySum, category - barWidth/2));	80	QPointF bottomRight = domain()->calculateGeometryPoint(QPointF(100 * (value + sum)/categorySum, category + barWidth/2));
54	rect.setTopLeft(topLeft);	81	rect.setTopLeft(topLeft);
55	rect.setBottomRight(bottomRight);	82	rect.setBottomRight(bottomRight);
56	layout.append(rect);	83	layout.append(rect.normalized());
57	sum +=value;	84	sum +=value;
58	}	85	}
59	}	86	}

0

src/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h +1 0

             private:
                 virtual QVector<QRectF> calculateLayout();
+                void initializeLayout();
             };
             QTCOMMERCIALCHART_END_NAMESPACE

0

src/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp 0 -12

             #include "qhorizontalpercentbarseries.h"
             #include "qhorizontalpercentbarseries_p.h"
             #include "horizontalpercentbarchartitem_p.h"
-            #include "horizontalpercentbaranimation_p.h"
             #include "chartdataset_p.h"
             #include "charttheme_p.h"
                 QAbstractSeriesPrivate::initializeGraphics(parent);
             }
-            void QHorizontalPercentBarSeriesPrivate::initializeAnimations(QtCommercialChart::QChart::AnimationOptions options)
-                HorizontalPercentBarChartItem *bar = static_cast<HorizontalPercentBarChartItem *>(m_item.data());
-                Q_ASSERT(bar);
-                if (options.testFlag(QChart::SeriesAnimations)) {
-                    bar->setAnimation(new HorizontalPercentBarAnimation(bar));
-                }else{
-                    bar->setAnimation(0);
-                QAbstractSeriesPrivate::initializeAnimations(options);
             #include "moc_qhorizontalpercentbarseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

0

src/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h 0 -1

             public:
                 QHorizontalPercentBarSeriesPrivate(QHorizontalPercentBarSeries *q);
                 void initializeGraphics(QGraphicsItem* parent);
-                void initializeAnimations(QtCommercialChart::QChart::AnimationOptions options);
                 void initializeDomain();
             private:
                 Q_DECLARE_PUBLIC(QHorizontalPercentBarSeries)

0

src/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp +28 -1

@@ -30,6 +30,33 HorizontalStackedBarChartItem::HorizontalStackedBarChartItem(QAbstractBarSeries
30	{	30	{
31	}	31	}
32		32
		33	void HorizontalStackedBarChartItem::initializeLayout()
		34	{
		35	qreal categoryCount = m_series->d_func()->categoryCount();
		36	qreal setCount = m_series->count();
		37	qreal barWidth = m_series->d_func()->barWidth();
		38
		39	m_layout.clear();
		40	for(int category = 0; category < categoryCount; category++) {
		41	for (int set = 0; set < setCount; set++) {
		42	QRectF rect;
		43	QPointF topLeft;
		44	QPointF bottomRight;
		45	if (domain()->type() == AbstractDomain::LogXYDomain \|\| domain()->type() == AbstractDomain::LogXLogYDomain) {
		46	topLeft = domain()->calculateGeometryPoint(QPointF(domain()->minX(), category - barWidth / 2));
		47	bottomRight = domain()->calculateGeometryPoint(QPointF(domain()->minX(), category + barWidth / 2));
		48	} else {
		49	topLeft = domain()->calculateGeometryPoint(QPointF(0, category - barWidth / 2));
		50	bottomRight = domain()->calculateGeometryPoint(QPointF(0, category + barWidth / 2));
		51	}
		52
		53	rect.setTopLeft(topLeft);
		54	rect.setBottomRight(bottomRight);
		55	m_layout.append(rect.normalized());
		56	}
		57	}
		58	}
		59
33	QVector<QRectF> HorizontalStackedBarChartItem::calculateLayout()	60	QVector<QRectF> HorizontalStackedBarChartItem::calculateLayout()
34	{	61	{
35	QVector<QRectF> layout;	62	QVector<QRectF> layout;
@@ -64,7 +91,7 QVector<QRectF> HorizontalStackedBarChartItem::calculateLayout()
64	}	91	}
65	rect.setTopLeft(topLeft);	92	rect.setTopLeft(topLeft);
66	rect.setBottomRight(bottomRight);	93	rect.setBottomRight(bottomRight);
67	layout.append(rect);	94	layout.append(rect.normalized());
68	}	95	}
69	}	96	}
70	return layout;	97	return layout;

0

src/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h +1 0

             private:
                 virtual QVector<QRectF> calculateLayout();
+                void initializeLayout();
             };
             QTCOMMERCIALCHART_END_NAMESPACE

0

src/barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp 0 -12

             #include "qhorizontalstackedbarseries.h"
             #include "qhorizontalstackedbarseries_p.h"
             #include "horizontalstackedbarchartitem_p.h"
-            #include "horizontalstackedbaranimation_p.h"
             #include "chartdataset_p.h"
             #include "charttheme_p.h"
                 QAbstractSeriesPrivate::initializeGraphics(parent);
             }
-            void QHorizontalStackedBarSeriesPrivate::initializeAnimations(QtCommercialChart::QChart::AnimationOptions options)
-                HorizontalStackedBarChartItem *bar = static_cast<HorizontalStackedBarChartItem *>(m_item.data());
-                Q_ASSERT(bar);
-                if (options.testFlag(QChart::SeriesAnimations)) {
-                    bar->setAnimation(new HorizontalStackedBarAnimation(bar));
-                }else{
-                    bar->setAnimation(0);
-                QAbstractSeriesPrivate::initializeAnimations(options);
             #include "moc_qhorizontalstackedbarseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

0

src/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h 0 -1

             public:
                 QHorizontalStackedBarSeriesPrivate(QHorizontalStackedBarSeries *q);
                 void initializeGraphics(QGraphicsItem* parent);
-                void initializeAnimations(QtCommercialChart::QChart::AnimationOptions options);
                 void initializeDomain();
             private:
                 Q_DECLARE_PUBLIC(QHorizontalStackedBarSeries)

0

src/barchart/qabstractbarseries.cpp +14 0

             #include "qvalueaxis.h"
             #include "qbarcategoryaxis.h"
             #include "qbarlegendmarker.h"
+            #include "baranimation_p.h"
+            #include "abstractbarchartitem_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 }
             }
+            void QAbstractBarSeriesPrivate::initializeAnimations(QChart::AnimationOptions options)
+            {
+                AbstractBarChartItem *bar = static_cast<AbstractBarChartItem *>(m_item.data());
+                Q_ASSERT(bar);
+                if (options.testFlag(QChart::SeriesAnimations)) {
+                    bar->setAnimation(new BarAnimation(bar));
+                }else{
+                    bar->setAnimation(0);
+                }
+                QAbstractSeriesPrivate::initializeAnimations(options);
+            }
             #include "moc_qabstractbarseries.cpp"
             #include "moc_qabstractbarseries_p.cpp"

0

src/barchart/qabstractbarseries_p.h +1 0

                 void initializeDomain();
                 void initializeAxes();
+                void initializeAnimations(QChart::AnimationOptions options);
                 void initializeTheme(int index, ChartTheme* theme, bool forced = false);
                 QList<QLegendMarker*> createLegendMarkers(QLegend *legend);

0

src/barchart/vertical/bar/barchartitem.cpp +29 -1

@@ -31,6 +31,34 BarChartItem::BarChartItem(QAbstractBarSeries series, QGraphicsItem item) :
31	{	31	{
32	}	32	}
33		33
		34	void BarChartItem::initializeLayout()
		35	{
		36	qreal categoryCount = m_series->d_func()->categoryCount();
		37	qreal setCount = m_series->count();
		38	qreal barWidth = m_series->d_func()->barWidth();
		39
		40	m_layout.clear();
		41	for(int category = 0; category < categoryCount; category++) {
		42	for (int set = 0; set < setCount; set++) {
		43	QRectF rect;
		44	QPointF topLeft;
		45	QPointF bottomRight;
		46
		47	if (domain()->type() == AbstractDomain::XLogYDomain \|\| domain()->type() == AbstractDomain::LogXLogYDomain) {
		48	topLeft = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2 + set/setCount * barWidth, domain()->minY()));
		49	bottomRight = domain()->calculateGeometryPoint(QPointF(category + barWidth / 2 + (set + 1)/setCount * barWidth, domain()->minY()));
		50	} else {
		51	topLeft = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2 + set/setCount * barWidth, 0));
		52	bottomRight = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2 + (set + 1)/setCount * barWidth, 0));
		53	}
		54
		55	rect.setTopLeft(topLeft);
		56	rect.setBottomRight(bottomRight);
		57	m_layout.append(rect.normalized());
		58	}
		59	}
		60	}
		61
34	QVector<QRectF> BarChartItem::calculateLayout()	62	QVector<QRectF> BarChartItem::calculateLayout()
35	{	63	{
36	QVector<QRectF> layout;	64	QVector<QRectF> layout;
@@ -52,7 +80,7 QVector<QRectF> BarChartItem::calculateLayout()
52	bottomRight = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2 + (set + 1)/(setCount) * barWidth, 0));	80	bottomRight = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2 + (set + 1)/(setCount) * barWidth, 0));
53	rect.setTopLeft(topLeft);	81	rect.setTopLeft(topLeft);
54	rect.setBottomRight(bottomRight);	82	rect.setBottomRight(bottomRight);
55	layout.append(rect);	83	layout.append(rect.normalized());
56	}	84	}
57	}	85	}
58	return layout;	86	return layout;

0

src/barchart/vertical/bar/barchartitem_p.h +1 0

             private:
                 virtual QVector<QRectF> calculateLayout();
+                void initializeLayout();
             };
             QTCOMMERCIALCHART_END_NAMESPACE

0

src/barchart/vertical/bar/qbarseries.cpp 0 -13

             #include "barchartitem_p.h"
             #include "chartdataset_p.h"
             #include "charttheme_p.h"
-            #include "baranimation_p.h"
             #include "qvalueaxis.h"
             #include "qbarcategoryaxis.h"
                 QAbstractSeriesPrivate::initializeGraphics(parent);
             }
-            void QBarSeriesPrivate::initializeAnimations(QtCommercialChart::QChart::AnimationOptions options)
-                BarChartItem *bar = static_cast<BarChartItem *>(m_item.data());
-                Q_ASSERT(bar);
-                if (options.testFlag(QChart::SeriesAnimations)) {
-                    bar->setAnimation(new BarAnimation(bar));
-                }else{
-                    bar->setAnimation(0);
-                QAbstractSeriesPrivate::initializeAnimations(options);
             #include "moc_qbarseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

0

src/barchart/vertical/bar/qbarseries_p.h 0 -1

             public:
                 QBarSeriesPrivate(QBarSeries *q);
                 void initializeGraphics(QGraphicsItem* parent);
-                void initializeAnimations(QtCommercialChart::QChart::AnimationOptions options);
                 void initializeDomain();
             private:

0

src/barchart/vertical/percent/percentbarchartitem.cpp +29 -1

@@ -31,6 +31,34 PercentBarChartItem::PercentBarChartItem(QAbstractBarSeries *series, QGraphicsIt
31	{	31	{
32	}	32	}
33		33
		34	void PercentBarChartItem::initializeLayout()
		35	{
		36	qreal categoryCount = m_series->d_func()->categoryCount();
		37	qreal setCount = m_series->count();
		38	qreal barWidth = m_series->d_func()->barWidth();
		39
		40	m_layout.clear();
		41	for(int category = 0; category < categoryCount; category++) {
		42	for (int set = 0; set < setCount; set++) {
		43	QRectF rect;
		44	QPointF topLeft;
		45	QPointF bottomRight;
		46
		47	if (domain()->type() == AbstractDomain::XLogYDomain \|\| domain()->type() == AbstractDomain::LogXLogYDomain) {
		48	topLeft = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2, domain()->minY()));
		49	bottomRight = domain()->calculateGeometryPoint(QPointF(category + barWidth / 2, domain()->minY()));
		50	} else {
		51	topLeft = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2, 0));
		52	bottomRight = domain()->calculateGeometryPoint(QPointF(category + barWidth / 2, 0));
		53	}
		54
		55	rect.setTopLeft(topLeft);
		56	rect.setBottomRight(bottomRight);
		57	m_layout.append(rect.normalized());
		58	}
		59	}
		60	}
		61
34	QVector<QRectF> PercentBarChartItem::calculateLayout()	62	QVector<QRectF> PercentBarChartItem::calculateLayout()
35	{	63	{
36	QVector<QRectF> layout;	64	QVector<QRectF> layout;
@@ -54,7 +82,7 QVector<QRectF> PercentBarChartItem::calculateLayout()
54	bottomRight = domain()->calculateGeometryPoint(QPointF(category + barWidth/2, set ? 100 * sum/categorySum : 0));	82	bottomRight = domain()->calculateGeometryPoint(QPointF(category + barWidth/2, set ? 100 * sum/categorySum : 0));
55	rect.setTopLeft(topLeft);	83	rect.setTopLeft(topLeft);
56	rect.setBottomRight(bottomRight);	84	rect.setBottomRight(bottomRight);
57	layout.append(rect);	85	layout.append(rect.normalized());
58	sum +=value;	86	sum +=value;
59	}	87	}
60	}	88	}

0

src/barchart/vertical/percent/percentbarchartitem_p.h +1 0

             private:
                 virtual QVector<QRectF> calculateLayout();
+                void initializeLayout();
             };
             QTCOMMERCIALCHART_END_NAMESPACE

0

src/barchart/vertical/percent/qpercentbarseries.cpp 0 -12

             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             #include "qvalueaxis.h"
-            #include "percentbaranimation_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 QAbstractSeriesPrivate::initializeGraphics(parent);
             }
-            void QPercentBarSeriesPrivate::initializeAnimations(QtCommercialChart::QChart::AnimationOptions options)
-                PercentBarChartItem *bar = static_cast<PercentBarChartItem *>(m_item.data());
-                Q_ASSERT(bar);
-                if (options.testFlag(QChart::SeriesAnimations)) {
-                    bar->setAnimation(new PercentBarAnimation(bar));
-                }else{
-                    bar->setAnimation(0);
-                QAbstractSeriesPrivate::initializeAnimations(options);
             #include "moc_qpercentbarseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

0

src/barchart/vertical/percent/qpercentbarseries_p.h 0 -1

                 QPercentBarSeriesPrivate(QPercentBarSeries *q);
                 void initializeDomain();
                 void initializeGraphics(QGraphicsItem* parent);
-                void initializeAnimations(QtCommercialChart::QChart::AnimationOptions options);
             private:
                 Q_DECLARE_PUBLIC(QPercentBarSeries)
             };

0

src/barchart/vertical/stacked/qstackedbarseries.cpp 0 -12

             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             #include "qvalueaxis.h"
-            #include "stackedbaranimation_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 QAbstractSeriesPrivate::initializeGraphics(parent);
             }
-            void QStackedBarSeriesPrivate::initializeAnimations(QtCommercialChart::QChart::AnimationOptions options)
-                StackedBarChartItem *bar = static_cast<StackedBarChartItem *>(m_item.data());
-                Q_ASSERT(bar);
-                if (options.testFlag(QChart::SeriesAnimations)) {
-                    bar->setAnimation(new StackedBarAnimation(bar));
-                }else{
-                    bar->setAnimation(0);
-                QAbstractSeriesPrivate::initializeAnimations(options);
             #include "moc_qstackedbarseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

0

src/barchart/vertical/stacked/qstackedbarseries_p.h 0 -1

             public:
                 QStackedBarSeriesPrivate(QStackedBarSeries *q);
                 void initializeGraphics(QGraphicsItem* parent);
-                void initializeAnimations(QtCommercialChart::QChart::AnimationOptions options);
                 void initializeDomain();
             private:
                 Q_DECLARE_PUBLIC(QStackedBarSeries)

0

src/barchart/vertical/stacked/stackedbarchartitem.cpp +32 -4

@@ -31,6 +31,34 StackedBarChartItem::StackedBarChartItem(QAbstractBarSeries *series, QGraphicsIt
31	{	31	{
32	}	32	}
33		33
		34	void StackedBarChartItem::initializeLayout()
		35	{
		36	qreal categoryCount = m_series->d_func()->categoryCount();
		37	qreal setCount = m_series->count();
		38	qreal barWidth = m_series->d_func()->barWidth();
		39
		40	m_layout.clear();
		41	for(int category = 0; category < categoryCount; category++) {
		42	for (int set = 0; set < setCount; set++) {
		43	QRectF rect;
		44	QPointF topLeft;
		45	QPointF bottomRight;
		46
		47	if (domain()->type() == AbstractDomain::XLogYDomain \|\| domain()->type() == AbstractDomain::LogXLogYDomain) {
		48	topLeft = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2, domain()->minY()));
		49	bottomRight = domain()->calculateGeometryPoint(QPointF(category + barWidth / 2, domain()->minY()));
		50	} else {
		51	topLeft = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2, 0));
		52	bottomRight = domain()->calculateGeometryPoint(QPointF(category + barWidth / 2, 0));
		53	}
		54
		55	rect.setTopLeft(topLeft);
		56	rect.setBottomRight(bottomRight);
		57	m_layout.append(rect.normalized());
		58	}
		59	}
		60	}
		61
34	QVector<QRectF> StackedBarChartItem::calculateLayout()	62	QVector<QRectF> StackedBarChartItem::calculateLayout()
35	{	63	{
36	QVector<QRectF> layout;	64	QVector<QRectF> layout;
@@ -55,16 +83,16 QVector<QRectF> StackedBarChartItem::calculateLayout()
55	topLeft = domain()->calculateGeometryPoint(QPointF(category + barWidth / 2, set ? negativeSum : 0));	83	topLeft = domain()->calculateGeometryPoint(QPointF(category + barWidth / 2, set ? negativeSum : 0));
56	negativeSum += value;	84	negativeSum += value;
57	} else {	85	} else {
58	~~bottomRigh~~t = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2, value + positiveSum));	86	topLeft = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2, value + positiveSum));
59	if (domain()->type() == AbstractDomain::XLogYDomain \|\| domain()->type() == AbstractDomain::LogXLogYDomain)	87	if (domain()->type() == AbstractDomain::XLogYDomain \|\| domain()->type() == AbstractDomain::LogXLogYDomain)
60	~~topLef~~t = domain()->calculateGeometryPoint(QPointF(category + barWidth / 2, set ? positiveSum : domain()->minY()));	88	bottomRight = domain()->calculateGeometryPoint(QPointF(category + barWidth / 2, set ? positiveSum : domain()->minY()));
61	else	89	else
62	~~topLef~~t = domain()->calculateGeometryPoint(QPointF(category + barWidth / 2, set ? positiveSum : 0));	90	bottomRight = domain()->calculateGeometryPoint(QPointF(category + barWidth / 2, set ? positiveSum : 0));
63	positiveSum += value;	91	positiveSum += value;
64	}	92	}
65	rect.setTopLeft(topLeft);	93	rect.setTopLeft(topLeft);
66	rect.setBottomRight(bottomRight);	94	rect.setBottomRight(bottomRight);
67	layout.append(rect);	95	layout.append(rect.normalized());
68	}	96	}
69	}	97	}
70	return layout;	98	return layout;

0

src/barchart/vertical/stacked/stackedbarchartitem_p.h +2 0

             private:
                 virtual QVector<QRectF> calculateLayout();
+                void initializeLayout();
             };
             QTCOMMERCIALCHART_END_NAMESPACE

0

src/animations/abstractbaranimation.cpp removed 0 -68

1

NO CONTENT: file was removed

0

src/animations/abstractbaranimation_p.h removed 0 -59

1

NO CONTENT: file was removed

0

src/animations/horizontalbaranimation.cpp removed 0 -74

1

NO CONTENT: file was removed

0

src/animations/horizontalbaranimation_p.h removed 0 -52

1

NO CONTENT: file was removed

0

src/animations/horizontalpercentbaranimation.cpp removed 0 -64

1

NO CONTENT: file was removed

0

src/animations/horizontalpercentbaranimation_p.h removed 0 -52

1

NO CONTENT: file was removed

0

src/animations/horizontalstackedbaranimation.cpp removed 0 -64

1

NO CONTENT: file was removed

0

src/animations/horizontalstackedbaranimation_p.h removed 0 -52

1

NO CONTENT: file was removed

0

src/animations/percentbaranimation.cpp removed 0 -64

1

NO CONTENT: file was removed

0

src/animations/percentbaranimation_p.h removed 0 -55

1

NO CONTENT: file was removed

0

src/animations/stackedbaranimation.cpp removed 0 -63

1

NO CONTENT: file was removed

0

src/animations/stackedbaranimation_p.h removed 0 -55

1

NO CONTENT: file was removed

	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