HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1577:779eeed6a402

Refactor QChart API...

Michal Klocek -

r1577:779eeed6a402

parent child

Context file:

r1577:779eeed6a402

Expand all files

demos/chartthemes/themewidget.cpp +3 -1

                     series->append(set);
                 }
                 chart->addSeries(series);
-                chart->setAxisX(series,axis);
+                chart->createDefaultAxes();
                 return chart;
             }
                     series->setName(name + QString::number(nameIndex));
                     nameIndex++;
                     chart->addSeries(series);
+                    chart->createDefaultAxes();
                 }
                 return chart;

examples/areachart/main.cpp +1 0

                 QChart* chart = new QChart();
                 chart->addSeries(series);
                 chart->setTitle("Simple areachart example");
+                chart->createDefaultAxes();
                 chart->axisX()->setRange(0, 20);
                 chart->axisY()->setRange(0, 10);
             //![4]

examples/barmodelmapper/tablewidget.cpp +1 -1

                 categories << "April" << "May" << "June" << "July" << "August";
                 QCategoriesAxis* axis = new QCategoriesAxis();
                 axis->append(categories);
-                chart->setAxisX(series,axis);
+                chart->createDefaultAxes();
                 //! [6]
                 //! [7]

examples/groupedbarchart/main.cpp +1 -1

                 categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun";
                 QCategoriesAxis* axis = new QCategoriesAxis();
                 axis->append(categories);
-                chart->setAxisX(series,axis);
+                chart->createDefaultAxes();
             //![4]
             //![5]

examples/linechart/main.cpp +2 0

                 QChart* chart = new QChart();
                 chart->legend()->hide();
                 chart->addSeries(series);
+                chart->createDefaultAxes();
                 chart->setTitle("Simple line chart example");
             //![3]
                 chartView->setRenderHint(QPainter::Antialiasing);
             //![4]
             //![5]
                 QMainWindow window;
                 window.setCentralWidget(chartView);

examples/percentbarchart/main.cpp +2 -1

                 categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun";
                 QCategoriesAxis* axis = new QCategoriesAxis();
                 axis->append(categories);
-                chart->setAxisX(series,axis);
+                chart->createDefaultAxes();
+                chart->setAxisX(axis,series);
             //![4]
             //![5]

examples/stackedbarchart/main.cpp +1 -4

                 categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun";
                 QCategoriesAxis* axis = new QCategoriesAxis();
                 axis->append(categories);
-                chart->setAxisX(series,axis);
+                chart->setAxisX(axis,series);
-            //    axis->setMinCategory(QString("Feb"));
-            //    axis->setMaxCategory(QString("May"));
-            //    axis->setRange(QString("Feb"), QString("Apr"));
             //![4]
             //![5]

examples/stackedbarchartdrilldown/drilldownchart.cpp +1 -1

                 addSeries(series);
-                setAxisX(series,axis);
+                createDefaultAxes();
                 setTitle(series->name());
             }

plugins/declarative/declarativeareaseries.cpp +2 -2

             void DeclarativeAreaSeries::setAxisX(QAbstractAxis *axis)
             {
-                chart()->setAxisX(this, axis);
+                chart()->setAxisX(axis,this);
             }
             QAbstractAxis *DeclarativeAreaSeries::axisX()
             void DeclarativeAreaSeries::setAxisY(QAbstractAxis *axis)
             {
-                chart()->setAxisY(this, axis);
+                chart()->setAxisY(axis,this);
             }
             QAbstractAxis *DeclarativeAreaSeries::axisY()

plugins/declarative/declarativebarseries.cpp +8 -8

             void DeclarativeBarSeries::setAxisX(QAbstractAxis *axis)
             {
-                chart()->setAxisX(this, axis);
+                chart()->setAxisX(axis, this);
             }
             QAbstractAxis *DeclarativeBarSeries::axisX()
             void DeclarativeBarSeries::setAxisY(QAbstractAxis *axis)
             {
-                chart()->setAxisY(this, axis);
+                chart()->setAxisY(axis, this);
             }
             QAbstractAxis *DeclarativeBarSeries::axisY()
             void DeclarativeGroupedBarSeries::setAxisX(QAbstractAxis *axis)
             {
-                chart()->setAxisX(this, axis);
+                chart()->setAxisX(axis, this);
             }
             QAbstractAxis *DeclarativeGroupedBarSeries::axisX()
             void DeclarativeGroupedBarSeries::setAxisY(QAbstractAxis *axis)
             {
-                chart()->setAxisY(this, axis);
+                chart()->setAxisY(axis, this);
             }
             QAbstractAxis *DeclarativeGroupedBarSeries::axisY()
             void DeclarativeStackedBarSeries::setAxisX(QAbstractAxis *axis)
             {
-                chart()->setAxisX(this, axis);
+                chart()->setAxisX(axis, this);
             }
             QAbstractAxis *DeclarativeStackedBarSeries::axisX()
             void DeclarativeStackedBarSeries::setAxisY(QAbstractAxis *axis)
             {
-                chart()->setAxisY(this, axis);
+                chart()->setAxisY(axis, this);
             }
             QAbstractAxis *DeclarativeStackedBarSeries::axisY()
             void DeclarativePercentBarSeries::setAxisX(QAbstractAxis *axis)
             {
-                chart()->setAxisX(this, axis);
+                chart()->setAxisX(axis, this);
             }
             QAbstractAxis *DeclarativePercentBarSeries::axisX()
             void DeclarativePercentBarSeries::setAxisY(QAbstractAxis *axis)
             {
-                chart()->setAxisY(this, axis);
+                chart()->setAxisY(axis, this);
             }
             QAbstractAxis *DeclarativePercentBarSeries::axisY()

plugins/declarative/declarativelineseries.cpp +2 -2

             void DeclarativeLineSeries::setAxisX(QAbstractAxis *axis)
             {
-                chart()->setAxisX(this, axis);
+                chart()->setAxisX(axis,this);
             }
             QAbstractAxis *DeclarativeLineSeries::axisX()
             void DeclarativeLineSeries::setAxisY(QAbstractAxis *axis)
             {
-                chart()->setAxisY(this, axis);
+                chart()->setAxisY(axis,this);
             }
             QAbstractAxis *DeclarativeLineSeries::axisY()

plugins/declarative/declarativescatterseries.cpp +2 -2

             void DeclarativeScatterSeries::setAxisX(QAbstractAxis *axis)
             {
-                chart()->setAxisX(this, axis);
+                chart()->setAxisX(axis,this);
             }
             QAbstractAxis *DeclarativeScatterSeries::axisX()
             void DeclarativeScatterSeries::setAxisY(QAbstractAxis *axis)
             {
-                chart()->setAxisY(this, axis);
+                chart()->setAxisY(axis,this);
             }
             QAbstractAxis *DeclarativeScatterSeries::axisY()

plugins/declarative/declarativesplineseries.cpp +2 -2

             void DeclarativeSplineSeries::setAxisX(QAbstractAxis *axis)
             {
-                chart()->setAxisX(this, axis);
+                chart()->setAxisX(axis,this);
             }
             QAbstractAxis *DeclarativeSplineSeries::axisX()
             void DeclarativeSplineSeries::setAxisY(QAbstractAxis *axis)
             {
-                chart()->setAxisY(this, axis);
+                chart()->setAxisY(axis,this);
             }
             QAbstractAxis *DeclarativeSplineSeries::axisY()

src/axis/chartaxis.cpp +36 -16

@@ -25,7 +25,7
25	#include "chartanimator_p.h"	25	#include "chartanimator_p.h"
26	#include <QPainter>	26	#include <QPainter>
27	#include <QDebug>	27	#include <QDebug>
28	#include <~~cmat~~h>	28	#include <qmath.h>
29		29
30	QTCOMMERCIALCHART_BEGIN_NAMESPACE	30	QTCOMMERCIALCHART_BEGIN_NAMESPACE
31		31
@@ -143,21 +143,6 void ChartAxis::updateLayout(QVector<qreal> &layout)
143	}	143	}
144	}	144	}
145		145
146	bool ChartAxis::createLabels(QStringList &labels,qreal min, qreal max,int ticks) const
147	{
148	Q_ASSERT(max>min);
149	Q_ASSERT(ticks>1);
150
151	int n = qMax(int(-floor(log10((max-min)/(ticks-1)))),0);
152	n++;
153	for (int i=0; i< ticks; i++) {
154	qreal value = min + (i * (max - min)/ (ticks-1));
155	Q_UNUSED(value);
156	labels << QString::number(value,'f',n);
157	}
158	return true;
159	}
160
161	void ChartAxis::setAxisOpacity(qreal opacity)	146	void ChartAxis::setAxisOpacity(qreal opacity)
162	{	147	{
163	m_axis->setOpacity(opacity);	148	m_axis->setOpacity(opacity);
@@ -354,6 +339,41 void ChartAxis::axisSelected()
354	qDebug()<<"TODO: axis clicked";	339	qDebug()<<"TODO: axis clicked";
355	}	340	}
356		341
		342
		343	void ChartAxis::createNumberLabels(QStringList &labels,qreal min, qreal max, int ticks) const
		344	{
		345	Q_ASSERT(max>min);
		346	Q_ASSERT(ticks>1);
		347
		348	int n = qMax(int(-floor(log10((max-min)/(ticks-1)))),0);
		349	n++;
		350	for (int i=0; i< ticks; i++) {
		351	qreal value = min + (i * (max - min)/ (ticks-1));
		352	labels << QString::number(value,'f',n);
		353	}
		354	}
		355
		356	void ChartAxis::createCategoryLabels(QStringList &labels,qreal min, qreal max,const QStringList &categories) const
		357	{
		358	Q_ASSERT(max>min);
		359	Q_UNUSED(max);
		360
		361	int x = qCeil(min);
		362	int count = 0;
		363
		364	// Try to find category for x coordinate
		365	while (count < m_ticksCount) {
		366	if ((x < categories.count()) && (x >= 0)) {
		367	labels << categories.at(x);
		368	} else {
		369	// No label for x coordinate
		370	labels << "";
		371	}
		372	x++;
		373	count++;
		374	}
		375	}
		376
357	#include "moc_chartaxis_p.cpp"	377	#include "moc_chartaxis_p.cpp"
358		378
359	QTCOMMERCIALCHART_END_NAMESPACE	379	QTCOMMERCIALCHART_END_NAMESPACE

src/axis/chartaxis_p.h +2 -1

             protected:
                 virtual void updateGeometry() = 0;
                 virtual QVector<qreal> calculateLayout() const = 0;
-                virtual bool createLabels(QStringList &labels,qreal min, qreal max,int ticks) const;
+                void createNumberLabels(QStringList &labels,qreal min, qreal max,int ticks) const;
+                void createCategoryLabels(QStringList &labels,qreal min, qreal max,const QStringList &categories) const;
             public Q_SLOTS:
                 void handleAxisUpdated();

src/axis/chartcategoriesaxisx.cpp +2 -28

             #include <QDebug>
             #include <QFontMetrics>
             #include <QCategoriesAxis>
-            #include <qmath.h>
             static int label_padding = 5;
             ChartCategoriesAxisX::ChartCategoriesAxisX(QCategoriesAxis *axis,ChartPresenter *presenter) : ChartAxis(axis,presenter),
               m_categoriesAxis(axis)
             {
-            ChartCategoriesAxisX::~ChartCategoriesAxisX()
             }
-            bool ChartCategoriesAxisX::createLabels(QStringList &labels,qreal min, qreal max,int ticks) const
+            ChartCategoriesAxisX::~ChartCategoriesAxisX()
             {
-                Q_ASSERT(max>min);
-                Q_UNUSED(ticks);
-                Q_UNUSED(max);
-                QStringList categories = m_categoriesAxis->categories();
-                int x = qCeil(min);
-                int count = 0;
-                // Try to find category for x coordinate
-                while (count < ticks) {
-                    if ((x < categories.count()) && (x >= 0)) {
-                        labels << categories.at(x);
-                    } else {
-                        // No label for x coordinate
-                        labels << "";
-                    x++;
-                    count++;
-                return true;
             }
             QVector<qreal> ChartCategoriesAxisX::calculateLayout() const
                 QStringList ticksList;
-                createLabels(ticksList,m_min,m_max,layout.size());
+                createCategoryLabels(ticksList,m_min,m_max,m_categoriesAxis->categories());
                 QList<QGraphicsItem *> lines = m_grid->childItems();
                 QList<QGraphicsItem *> labels = m_labels->childItems();

src/axis/chartcategoriesaxisx_p.h 0 -1

                 ~ChartCategoriesAxisX();
                 AxisType axisType() const { return X_AXIS;}
-                bool createLabels(QStringList &labels,qreal min, qreal max,int ticks) const;
             protected:
                 QVector<qreal> calculateLayout() const;

src/axis/chartcategoriesaxisy.cpp +11 -30

@@ -25,6 +25,7
25	#include <QGraphicsLayout>	25	#include <QGraphicsLayout>
26	#include <QDebug>	26	#include <QDebug>
27	#include <QFontMetrics>	27	#include <QFontMetrics>
		28	#include <QCategoriesAxis>
28		29
29	static int label_padding = 5;	30	static int label_padding = 5;
30		31
@@ -65,7 +66,7 void ChartCategoriesAxisY::updateGeometry()
65		66
66	QStringList ticksList;	67	QStringList ticksList;
67		68
68	~~bool~~ ~~categories~~ = ~~create~~Labels(ticksList,m_min,m_max,~~layout~~.~~size~~());	69	createCategoryLabels(ticksList,m_min,m_max,m_categoriesAxis->categories());
69		70
70	QList<QGraphicsItem *> lines = m_grid->childItems();	71	QList<QGraphicsItem *> lines = m_grid->childItems();
71	QList<QGraphicsItem *> labels = m_labels->childItems();	72	QList<QGraphicsItem *> labels = m_labels->childItems();
@@ -78,38 +79,18 void ChartCategoriesAxisY::updateGeometry()
78	QGraphicsLineItem lineItem = static_cast<QGraphicsLineItem>(axis.at(0));	79	QGraphicsLineItem lineItem = static_cast<QGraphicsLineItem>(axis.at(0));
79	lineItem->setLine(m_rect.left(), m_rect.bottom(), m_rect.right(), m_rect.bottom());	80	lineItem->setLine(m_rect.left(), m_rect.bottom(), m_rect.right(), m_rect.bottom());
80		81
81	qreal width = 0;	82	for (int i = 1; i < layout.size(); ++i) {
82	for (int i = 0; i < layout.size(); ++i) {
83	QGraphicsLineItem lineItem = static_cast<QGraphicsLineItem>(lines.at(i));	83	QGraphicsLineItem lineItem = static_cast<QGraphicsLineItem>(lines.at(i));
84	lineItem->setLine(layout[i], m_rect.top(), layout[i], m_rect.bottom());	84	lineItem->setLine(layout[i], m_rect.top(), layout[i], m_rect.bottom());
85	QGraphicsSimpleTextItem labelItem = static_cast<QGraphicsSimpleTextItem>(labels.at(i));	85	QGraphicsSimpleTextItem labelItem = static_cast<QGraphicsSimpleTextItem>(labels.at(i));
86	if (!categories \|\| i<1) {	86
87	labelItem->setText(ticksList.at(i));	87	labelItem->setText(ticksList.at(i));
88	const QRectF& rect = labelItem->boundingRect();	88	const QRectF& rect = labelItem->boundingRect();
89	QPointF center = rect.center();	89	QPointF center = rect.center();
90	labelItem->setTransformOriginPoint(center.x(), center.y());	90	labelItem->setTransformOriginPoint(center.x(), center.y());
91	labelItem->setPos(layout[i] - center.x(), m_rect.bottom() + label_padding);	91	labelItem->setPos(layout[i] - (layout[i] - layout[i-1])/2 - center.x(), m_rect.bottom() + label_padding);
92		92	m_minWidth+=rect.width();
93	if(labelItem->pos().x()<=width){	93	m_minHeight=qMax(rect.height()+label_padding,m_minHeight);
94	labelItem->setVisible(false);
95	lineItem->setVisible(false);
96	}else{
97	labelItem->setVisible(true);
98	lineItem->setVisible(true);
99	width=rect.width()+labelItem->pos().x();
100	}
101	m_minWidth+=rect.width();
102	m_minHeight=qMax(rect.height(),m_minHeight);
103	}
104	else {
105	labelItem->setText(ticksList.at(i));
106	const QRectF& rect = labelItem->boundingRect();
107	QPointF center = rect.center();
108	labelItem->setTransformOriginPoint(center.x(), center.y());
109	labelItem->setPos(layout[i] - (layout[i] - layout[i-1])/2 - center.x(), m_rect.bottom() + label_padding);
110	m_minWidth+=rect.width();
111	m_minHeight=qMax(rect.height()+label_padding,m_minHeight);
112	}
113		94
114	if ((i+1)%2 && i>1) {	95	if ((i+1)%2 && i>1) {
115	QGraphicsRectItem rectItem = static_cast<QGraphicsRectItem>(shades.at(i/2-1));	96	QGraphicsRectItem rectItem = static_cast<QGraphicsRectItem>(shades.at(i/2-1));

src/axis/chartcategoriesaxisy_p.h +4 0

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QAbstractAxis;
+            class QCategoriesAxis;
             class ChartPresenter;
             class ChartCategoriesAxisY : public ChartAxis
             protected:
                 QVector<qreal> calculateLayout() const;
                 void updateGeometry();
+            private:
+                QCategoriesAxis *m_categoriesAxis;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/axis/chartvaluesaxisx.cpp +2 -27

             {
             }
-            bool ChartValuesAxisX::createLabels(QStringList &labels,qreal min, qreal max,int ticks) const
-                Q_ASSERT(max>min);
-                Q_ASSERT(ticks>1);
-                int n = qMax(int(-floor(log10((max-min)/(ticks-1)))),0);
-                n++;
-                for (int i=0; i< ticks; i++) {
-                    qreal value = min + (i * (max - min)/ (ticks-1));
-                    Q_UNUSED(value);
-                    labels << QString::number(value,'f',n);
-                return true;
             QVector<qreal> ChartValuesAxisX::calculateLayout() const
             {
                 Q_ASSERT(m_ticksCount>=2);
                 QStringList ticksList;
-                int ticks = layout.size();
+                createNumberLabels(ticksList,m_min,m_max,layout.size());
-                int n = qMax(int(-floor(log10((m_max-m_min)/(ticks-1)))),0);
-                n++;
-                for (int i=0; i< ticks; i++) {
-                    qreal value = m_min + (i * (m_max - m_min)/ (ticks-1));
-                    Q_UNUSED(value);
-                    ticksList << QString::number(value,'f',n);
-                bool categories = false; //createLabels(ticksList,m_min,m_max,layout.size());
                 QList<QGraphicsItem *> lines = m_grid->childItems();
                 QList<QGraphicsItem *> labels = m_labels->childItems();
                     QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem*>(lines.at(i));
                     lineItem->setLine(layout[i], m_rect.top(), layout[i], m_rect.bottom());
                     QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem*>(labels.at(i));
-                    if (!categories || i<1) {
                         labelItem->setText(ticksList.at(i));
                         const QRectF& rect = labelItem->boundingRect();
                         QPointF center = rect.center();
                         }
                         m_minWidth+=rect.width();
                         m_minHeight=qMax(rect.height(),m_minHeight);
                     if ((i+1)%2 && i>1) {
                         QGraphicsRectItem *rectItem = static_cast<QGraphicsRectItem*>(shades.at(i/2-1));
                         rectItem->setRect(layout[i-1],m_rect.top(),layout[i]-layout[i-1],m_rect.height());

src/axis/chartvaluesaxisx_p.h +4 -1

                 ~ChartValuesAxisX();
                 AxisType axisType() const { return X_AXIS;}
-                bool createLabels(QStringList &labels,qreal min, qreal max,int ticks) const;
             protected:
                 QVector<qreal> calculateLayout() const;
                 void updateGeometry();
+            private:
+                void createLabels(QStringList &labels,qreal min, qreal max,int ticks) const;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/axis/chartvaluesaxisy.cpp +1 -23

                 QStringList ticksList;
-                int ticks = layout.size();
+                createNumberLabels(ticksList,m_min,m_max,layout.size());
-                int n = qMax(int(-floor(log10((m_max-m_min)/(ticks-1)))),0);
-                n++;
-                for (int i=0; i< ticks; i++) {
-                    qreal value = m_min + (i * (m_max - m_min)/ (ticks-1));
-                    Q_UNUSED(value);
-                    ticksList << QString::number(value,'f',n);
-                bool categories = false;
-            //    bool categories = createLabels(ticksList,m_min,m_max,layout.size());
                 QList<QGraphicsItem *> lines = m_grid->childItems();
                 QList<QGraphicsItem *> labels = m_labels->childItems();
                     lineItem->setLine(m_rect.left() , layout[i], m_rect.right(), layout[i]);
                     QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem*>(labels.at(i));
-                    if (!categories || i<1) {
                         labelItem->setText(ticksList.at(i));
                         const QRectF& rect = labelItem->boundingRect();
                         m_minWidth=qMax(rect.width()+label_padding,m_minWidth);
                         m_minHeight+=rect.height();
-                    else {
-                        labelItem->setText(ticksList.at(i));
-                        const QRectF& rect = labelItem->boundingRect();
-                        m_minWidth=qMax(rect.width(),m_minWidth);
-                        m_minHeight+=rect.height();
-                        QPointF center = rect.center();
-                        labelItem->setTransformOriginPoint(center.x(), center.y());
-                        labelItem->setPos(m_rect.left() - rect.width() - label_padding , layout[i] - (layout[i] - layout[i-1])/2 -center.y());
                     if ((i+1)%2 && i>1) {
                         QGraphicsRectItem *rectItem = static_cast<QGraphicsRectItem*>(shades.at(i/2-1));

src/chartdataset.cpp +80 -59

@@ -43,35 +43,16 ChartDataSet::~ChartDataSet()
43		43
44	void ChartDataSet::addSeries(QAbstractSeries* series)	44	void ChartDataSet::addSeries(QAbstractSeries* series)
45	{	45	{
46	~~QAbstractAxis~~* ~~axis~~ = m_series~~AxisX~~Map.value(series);	46	Domain* domain = m_seriesDomainMap.value(series);
47		47
48	if(~~axis~~) {	48	if(domain) {
49	qWarning() << "Can not add series. Series already on the chart";	49	qWarning() << "Can not add series. Series already on the chart";
50	return;	50	return;
51	}	51	}
52		52
53	QAbstractAxis* axisX = series->d_ptr->createAxisX(this);
54	QAbstractAxis* axisY = series->d_ptr->createAxisY(this);
55
56	series->setParent(this); // take ownership	53	series->setParent(this); // take ownership
57		54
58	~~Domain~~* domain = new Domain(series);	55	domain = new Domain(series);
59
60	if(axisX){
61	QObject::connect(axisX->d_ptr.data(),SIGNAL(changed(qreal,qreal,int,bool)),domain,SLOT(handleAxisXChanged(qreal,qreal,int,bool)));
62	QObject::connect(domain,SIGNAL(rangeXChanged(qreal,qreal,int)),axisX->d_ptr.data(),SLOT(handleAxisRangeChanged(qreal,qreal,int)));
63	axisX->d_ptr->m_orientation=Qt::Horizontal;
64	emit axisAdded(axisX,domain);
65	m_seriesAxisXMap.insert(series,axisX);
66	}
67
68	if(axisY){
69	QObject::connect(axisY->d_ptr.data(),SIGNAL(changed(qreal,qreal,int,bool)),domain,SLOT(handleAxisYChanged(qreal,qreal,int,bool)));
70	QObject::connect(domain,SIGNAL(rangeYChanged(qreal,qreal,int)),axisY->d_ptr.data(),SLOT(handleAxisRangeChanged(qreal,qreal,int)));
71	axisY->d_ptr->m_orientation=Qt::Vertical;
72	emit axisAdded(axisY,domain);
73	m_seriesAxisYMap.insert(series,axisY);
74	}
75		56
76	m_seriesDomainMap.insert(series,domain);	57	m_seriesDomainMap.insert(series,domain);
77		58
@@ -97,6 +78,44 void ChartDataSet::addSeries(QAbstractSeries* series)
97		78
98	}	79	}
99		80
		81	void ChartDataSet::createDefaultAxes()
		82	{
		83	QMapIterator<QAbstractSeries, Domain> i(m_seriesDomainMap);
		84
		85	while (i.hasNext()) {
		86	i.next();
		87
		88	if(!m_seriesAxisXMap.value(i.key()))
		89	{
		90
		91	QAbstractAxis* axisX = i.key()->d_ptr->createAxisX(this);
		92
		93	if(axisX) {
		94	QObject::connect(axisX->d_ptr.data(),SIGNAL(changed(qreal,qreal,int,bool)),i.value(),SLOT(handleAxisXChanged(qreal,qreal,int,bool)));
		95	QObject::connect(i.value(),SIGNAL(rangeXChanged(qreal,qreal,int)),axisX->d_ptr.data(),SLOT(handleAxisRangeChanged(qreal,qreal,int)));
		96	axisX->d_ptr->m_orientation=Qt::Horizontal;
		97	emit axisAdded(axisX,i.value());
		98	m_seriesAxisXMap.insert(i.key(),axisX);
		99	}
		100
		101	}
		102
		103	if(!m_seriesAxisYMap.value(i.key()))
		104	{
		105	QAbstractAxis* axisY = i.key()->d_ptr->createAxisY(this);
		106
		107	if(axisY) {
		108	QObject::connect(axisY->d_ptr.data(),SIGNAL(changed(qreal,qreal,int,bool)),i.value(),SLOT(handleAxisYChanged(qreal,qreal,int,bool)));
		109	QObject::connect(i.value(),SIGNAL(rangeYChanged(qreal,qreal,int)),axisY->d_ptr.data(),SLOT(handleAxisRangeChanged(qreal,qreal,int)));
		110	axisY->d_ptr->m_orientation=Qt::Vertical;
		111	emit axisAdded(axisY,i.value());
		112	m_seriesAxisYMap.insert(i.key(),axisY);
		113	}
		114	}
		115	}
		116	}
		117
		118
100	void ChartDataSet::removeSeries(QAbstractSeries* series)	119	void ChartDataSet::removeSeries(QAbstractSeries* series)
101	{	120	{
102	Domain* domain = m_seriesDomainMap.take(series);	121	Domain* domain = m_seriesDomainMap.take(series);
@@ -180,7 +199,7 void ChartDataSet::zoomOutDomain(const QRectF& rect, const QSizeF& size)
180	int ChartDataSet::seriesCount(QAbstractSeries::SeriesType type)	199	int ChartDataSet::seriesCount(QAbstractSeries::SeriesType type)
181	{	200	{
182	int count=0;	201	int count=0;
183	QMapIterator<QAbstractSeries, ~~QAbstractAxis~~> i(m_series~~AxisX~~Map);	202	QMapIterator<QAbstractSeries, Domain> i(m_seriesDomainMap);
184	while (i.hasNext()) {	203	while (i.hasNext()) {
185	i.next();	204	i.next();
186	if(i.key()->type()==type) count++;	205	if(i.key()->type()==type) count++;
@@ -213,37 +232,38 QAbstractAxis* ChartDataSet::axisY(QAbstractSeries *series) const
213		232
214	void ChartDataSet::setAxisX(QAbstractSeries series, QAbstractAxis axis)	233	void ChartDataSet::setAxisX(QAbstractSeries series, QAbstractAxis axis)
215	{	234	{
216
217	Q_ASSERT(axis);	235	Q_ASSERT(axis);
218	~~QAbstractAxis~~ *~~oldAxis~~ = m_series~~AxisX~~Map.~~tak~~e(series);	236	Domain* domain = m_seriesDomainMap.value(series);
219		237
220	if(!~~oldAxis~~) {	238	if(!domain) {
221	qWarning()<<"Series not found on the chart.";	239	qWarning() << "Series not found on the chart.";
222	return;	240	return;
223	}	241	}
224		242
225	if(axis->d_ptr->m_orientation==Qt::Vertical) {	243	if(axis->d_ptr->m_orientation==Qt::Vertical) {
226	qWarning()<<"Axis already defined as axis Y";	244	qWarning()<<"Axis already defined as axis Y";
227	return;	245	return;
228	}	246	}
229		247
230	~~QList~~<QAbstractAxis*> ~~axesX~~ = m_seriesAxisXMap.~~values~~();	248	QAbstractAxis *oldAxis = m_seriesAxisXMap.take(series);
231	int x = axesX.indexOf(oldAxis);	249	QList<QAbstractAxis*> axesX = m_seriesAxisXMap.values();
232	if(x==-1) {
233	emit axisRemoved(oldAxis);
234	oldAxis->deleteLater();
235	}
236		250
237	Domain* domain = m_seriesDomainMap.value(series);	251	if(oldAxis) {
238	Q_ASSERT(domain);	252
		253	int x = axesX.indexOf(oldAxis);
		254	if(x==-1) {
		255	emit axisRemoved(oldAxis);
		256	oldAxis->deleteLater();
		257	}
		258	}
239		259
240	QObject::connect(axis->d_ptr.data(),SIGNAL(changed(qreal,qreal,int,bool)),domain,SLOT(handleAxisXChanged(qreal,qreal,int,bool)));	260	QObject::connect(axis->d_ptr.data(),SIGNAL(changed(qreal,qreal,int,bool)),domain,SLOT(handleAxisXChanged(qreal,qreal,int,bool)));
241	QObject::connect(domain,SIGNAL(rangeXChanged(qreal,qreal,int)),axis->d_ptr.data(),SLOT(handleAxisRangeChanged(qreal,qreal,int)));	261	QObject::connect(domain,SIGNAL(rangeXChanged(qreal,qreal,int)),axis->d_ptr.data(),SLOT(handleAxisRangeChanged(qreal,qreal,int)));
242		262
243	x = axesX.indexOf(axis);	263	int x = axesX.indexOf(axis);
244	if(x==-1) {	264	if(x==-1) {
245	axis->d_ptr->m_orientation=Qt::Horizontal;	265	axis->d_ptr->m_orientation=Qt::Horizontal;
246	emit axisAdded(axis,domain);	266	emit axisAdded(axis,domain);
247	}	267	}
248		268
249	m_seriesAxisXMap.insert(series,axis);	269	m_seriesAxisXMap.insert(series,axis);
@@ -254,39 +274,40 void ChartDataSet::setAxisX(QAbstractSeries series, QAbstractAxis axis)
254		274
255	void ChartDataSet::setAxisY(QAbstractSeries series, QAbstractAxis axis)	275	void ChartDataSet::setAxisY(QAbstractSeries series, QAbstractAxis axis)
256	{	276	{
257	Q_ASSERT(axis);	277	Q_ASSERT(axis);
258	QAbstractAxis *oldAxis = m_seriesAxisYMap.take(series);	278	Domain* domain = m_seriesDomainMap.value(series);
259		279
260	if(!oldAxis) {	280	if(!domain) {
261	qWarning()<<"Series not found on the chart ~~or axis is unsupported for given series type~~";	281	qWarning() << "Series not found on the chart.";
262	return;	282	return;
263	}	283	}
264		284
265	if(axis->d_ptr->m_orientation==Qt::Horizontal) {	285	if(axis->d_ptr->m_orientation==Qt::Horizontal) {
266	qWarning()<<"Axis already defined as axis X";	286	qWarning()<<"Axis already defined as axis X";
267	return;	287	return;
268	}	288	}
269		289
270	~~QList~~<QAbstractAxis*> ~~axesY~~ = m_seriesAxisYMap.~~values~~();	290	QAbstractAxis *oldAxis = m_seriesAxisYMap.take(series);
271	int y = axesY.indexOf(oldAxis);	291	QList<QAbstractAxis*> axesY = m_seriesAxisYMap.values();
272	if(y==-1) {
273	emit axisRemoved(oldAxis);
274	oldAxis->deleteLater();
275	}
276		292
277	Domain* domain = m_seriesDomainMap.value(series);	293	if(oldAxis) {
278	Q_ASSERT(domain);	294	int y = axesY.indexOf(oldAxis);
		295	if(y==-1) {
		296	emit axisRemoved(oldAxis);
		297	oldAxis->deleteLater();
		298	}
		299	}
279		300
280	QObject::connect(axis->d_ptr.data(),SIGNAL(changed(qreal,qreal,int,bool)),domain,SLOT(handleAxisYChanged(qreal,qreal,int,bool)));	301	QObject::connect(axis->d_ptr.data(),SIGNAL(changed(qreal,qreal,int,bool)),domain,SLOT(handleAxisYChanged(qreal,qreal,int,bool)));
281	QObject::connect(domain,SIGNAL(rangeYChanged(qreal,qreal,int)),axis->d_ptr.data(),SLOT(handleAxisRangeChanged(qreal,qreal,int)));	302	QObject::connect(domain,SIGNAL(rangeYChanged(qreal,qreal,int)),axis->d_ptr.data(),SLOT(handleAxisRangeChanged(qreal,qreal,int)));
282		303
283	y = axesY.indexOf(axis);	304	int y = axesY.indexOf(axis);
284	if(y==-1) {	305	if(y==-1) {
285	axis->d_ptr->m_orientation=Qt::Vertical;	306	axis->d_ptr->m_orientation=Qt::Vertical;
286	emit axisAdded(axis,domain);	307	emit axisAdded(axis,domain);
287	}	308	}
288		309
289	m_seriesAxisYMap.insert(series,axis);	310	m_seriesAxisYMap.insert(series,axis);
290	}	311	}
291		312
292	Domain* ChartDataSet::domain(QAbstractSeries *series) const	313	Domain* ChartDataSet::domain(QAbstractSeries *series) const

src/chartdataset_p.h +2 0

                 QList<QAbstractSeries*> series() const;
                 Domain* domain(QAbstractSeries *series) const;
+                void createDefaultAxes();
             Q_SIGNALS:
                 void seriesAdded(QAbstractSeries* series, Domain* domain);
                 void seriesRemoved(QAbstractSeries* series);

src/qchart.cpp +9 -4

                 return d_ptr->m_dataset->axisY(series);
             }
+            void QChart::createDefaultAxes()
+            {
+            	d_ptr->m_dataset->createDefaultAxes();
+            }
             /*!
              Returns the legend object of the chart. Ownership stays in chart.
              */
                 d_ptr->m_presenter->setMarginsMinimum(margins);
             }
-            void QChart::setAxisX(QAbstractSeries *series, QAbstractAxis* axis)
+            void QChart::setAxisX(QAbstractAxis* axis , QAbstractSeries *series)
             {
-                d_ptr->m_dataset->setAxisX(series, axis);
+                d_ptr->m_dataset->setAxisX(series,axis);
             }
-            void QChart::setAxisY(QAbstractSeries *series, QAbstractAxis* axis)
+            void QChart::setAxisY( QAbstractAxis* axis , QAbstractSeries *series)
             {
-                d_ptr->m_dataset->setAxisY(series, axis);
+                d_ptr->m_dataset->setAxisY(series,axis);
             }
             //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

src/qchart.h +5 -3

                 void removeAllSeries();
                 QList<QAbstractSeries*> series() const;
-                void setAxisX(QAbstractSeries *series, QAbstractAxis* axis);
+                void setAxisX(QAbstractAxis* axis, QAbstractSeries *series = 0);
-                void setAxisY(QAbstractSeries *series, QAbstractAxis* axis);
+                void setAxisY(QAbstractAxis* axis, QAbstractSeries *series = 0);
                 QAbstractAxis* axisX(QAbstractSeries* series = 0) const;
                 QAbstractAxis* axisY(QAbstractSeries* series = 0) const;
+                void createDefaultAxes();
                 void setTheme(QChart::ChartTheme theme);
                 QChart::ChartTheme theme() const;
                 void zoom(qreal factor);
                 void scroll(qreal dx, qreal dy);
-                void adjustViewToSeries(QAbstractSeries* series= 0);
+                void adjustViewToSeries(QAbstractSeries* series = 0);
                 QLegend* legend() const;

tests/auto/chartdataset/tst_chartdataset.cpp +16 -11

             	QVERIFY(m_dataset->domain(series) == 0);
             	QVERIFY(m_dataset->axisX(series) == 0);
             	QVERIFY(m_dataset->axisY(series) == 0);
+            	m_dataset->createDefaultAxes();
             }
                 QSignalSpy spy3(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries *)));
                 m_dataset->addSeries(series);
+                m_dataset->createDefaultAxes();
                 if(series->type()==QAbstractSeries::SeriesTypePie){
                     TRY_COMPARE(spy0.count(), 0);
                 }else{
                     m_dataset->addSeries(series);
                 }
-                TRY_COMPARE(spy0.count(), seriesList.count()*2);
+                TRY_COMPARE(spy0.count(), 0);
                 TRY_COMPARE(spy1.count(), 0);
                 TRY_COMPARE(spy2.count(), seriesList.count());
                 TRY_COMPARE(spy3.count(), 0);
                 }
                 TRY_COMPARE(spy4.count(), axisCount);
-                TRY_COMPARE(spy5.count(), seriesList.count());
+                TRY_COMPARE(spy5.count(), 0);
                 TRY_COMPARE(spy6.count(), 0);
                 TRY_COMPARE(spy7.count(), 0);
                     m_dataset->addSeries(series);
                 }
-                TRY_COMPARE(spy0.count(), seriesList.count()*2);
+                TRY_COMPARE(spy0.count(), 0);
                 TRY_COMPARE(spy1.count(), 0);
                 TRY_COMPARE(spy2.count(), seriesList.count());
                 TRY_COMPARE(spy3.count(), 0);
                 }
                 TRY_COMPARE(spy4.count(), axisCount);
-                TRY_COMPARE(spy5.count(), seriesList.count());
+                TRY_COMPARE(spy5.count(), 0);
                 TRY_COMPARE(spy6.count(), 0);
                 TRY_COMPARE(spy7.count(), 0);
                 QFETCH(QAbstractSeries*, series);
                 m_dataset->addSeries(series);
+                m_dataset->createDefaultAxes();
                 QSignalSpy spy0(m_dataset, SIGNAL(axisAdded(QAbstractAxis*, Domain *)));
                 QSignalSpy spy1(m_dataset, SIGNAL(axisRemoved(QAbstractAxis*)));
                 m_dataset->removeAllSeries();
                 TRY_COMPARE(spy0.count(), 0);
-                TRY_COMPARE(spy1.count(), axisCount + seriesList.count());
+                TRY_COMPARE(spy1.count(), axisCount);
                 TRY_COMPARE(spy2.count(), 0);
                 TRY_COMPARE(spy3.count(), seriesList.count());
             }
                 m_dataset->addSeries(series);
                 QVERIFY(m_dataset->domain(series));
-                if(series->type()!=QAbstractSeries::SeriesTypePie){
-                TRY_COMPARE(spy0.count(), 2);
+                TRY_COMPARE(spy0.count(), 0);
                 TRY_COMPARE(spy1.count(), 0);
                 TRY_COMPARE(spy2.count(), 1);
                     m_dataset->addSeries(series);
                 }
-                for (int i = 1; i < seriesList.count(); i++) {
+                /*
-                    m_dataset->setAxisX(seriesList.at(i), m_dataset->axisX(seriesList.at(0)));
+                QValuesAxis* axis = new QValuesAxis();
+                for (int i = 0; i < seriesList.count(); i++) {
+                    m_dataset->setAxisX(seriesList.at(i), axis);
                 }
+            */
+                m_dataset->createDefaultAxes();
                 QList<QSignalSpy*> spyList;

tests/auto/qchart/tst_qchart.cpp +5 -5

                 QVERIFY(!series->chart());
                 QCOMPARE(m_chart->series().count(), 0);
                 m_chart->addSeries(series);
-                m_chart->setAxisY(series,axis);
+                m_chart->setAxisY(axis,series);
                 QCOMPARE(m_chart->series().count(), 1);
                 QCOMPARE(m_chart->series().first(), series);
                 QVERIFY(series->chart() == m_chart);
                 QLineSeries* series0 = new QLineSeries();
                 m_chart->addSeries(series0);
-                m_chart->setAxisY(series0,axis0);
+                m_chart->setAxisY(axis0,series0);
                 QLineSeries* series1 = new QLineSeries();
                 m_chart->addSeries(series1);
-                m_chart->setAxisY(series1,axis1);
+                m_chart->setAxisY(axis1,series1);
                 QLineSeries* series2 = new QLineSeries();
                 m_chart->addSeries(series2);
-                m_chart->setAxisY(series2,axis2);
+                m_chart->setAxisY(axis2,series2);
                 if (!axis0)
                     axis0 = defaultAxisY;
                 QTest::qWaitForWindowShown(m_view);
                 if(!axis) axis = m_chart->axisY();
                 m_chart->addSeries(series);
-                m_chart->setAxisY(series,axis);
+                m_chart->setAxisY(axis,series);
                 QCOMPARE(m_chart->axisY(series),axis);
                 m_chart->removeSeries(series);
                 QVERIFY(m_chart->axisY(series)==0);

tests/chartwidgettest/mainwidget.cpp +4 -4

                         series = new QBarSeries(this);
                         QCategoriesAxis* axis = new QCategoriesAxis();
                         axis->append(category);
-                        m_chart->setAxisX(series,axis);
+                        m_chart->setAxisX(axis,series);
                     } else if (seriesName == "Grouped bar") {
                         series = new QGroupedBarSeries(this);
                         QCategoriesAxis* axis = new QCategoriesAxis();
                         axis->append(category);
-                        m_chart->setAxisX(series,axis);
+                        m_chart->setAxisX(axis,series);
                     } else if (seriesName == "Stacked bar") {
                         series = new QStackedBarSeries(this);
                         QCategoriesAxis* axis = new QCategoriesAxis();
                         axis->append(category);
-                        m_chart->setAxisX(series,axis);
+                        m_chart->setAxisX(axis,series);
                     } else {
                         series = new QPercentBarSeries(this);
                         QCategoriesAxis* axis = new QCategoriesAxis();
                         axis->append(category);
-                        m_chart->setAxisX(series,axis);
+                        m_chart->setAxisX(axis,series);
                     }
                     for (int j(0); j < data.count(); j++) {

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