HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r825:d850de289019

Reserve ordering of chart series internally....

Tero Ahola -

r825:d850de289019

parent child

Context file:

r825:d850de289019

Collapse all files

src/chartdataset.cpp +53 -64

             {
                 if(axisY==0) axisY = m_axisY;
-                QChartAxis* axis = m_seriesAxisMap.value(series);
+                if (seriesIndex(series) > -1) {
-                if(axis) {
                     qWarning() << "Can not add series. Series already on the chart";
                     return;
                 }
                 }
                 Domain* domain = m_axisDomainMap.value(axisY);
+                if (!domain) {
-                if(!domain) {
                     domain = new Domain(axisY);
                     QObject::connect(axisY,SIGNAL(changed(qreal,qreal,int,bool)),domain,SLOT(handleAxisYChanged(qreal,qreal,int,bool)));
                     QObject::connect(axisX(),SIGNAL(changed(qreal,qreal,int,bool)),domain,SLOT(handleAxisXChanged(qreal,qreal,int,bool)));
                     emit axisAdded(axisY,domain);
                 }
-                if(!m_axisXInitialized){
+                if (!m_axisXInitialized) {
-                   emit axisAdded(axisX(),domain);
+                   emit axisAdded(axisX(), domain);
-                   m_axisXInitialized=true;
+                   m_axisXInitialized = true;
                 }
-                calculateDomain(series,domain);
+                calculateDomain(series, domain);
-                m_seriesAxisMap.insert(series,axisY);
+                m_seriesAxisList.append(QPair<QSeries*, QChartAxis*>(series, axisY));
-                emit seriesAdded(series,domain);
+                emit seriesAdded(series, domain);
             }
             void ChartDataSet::removeSeries(QSeries* series)
             {
+                int index = seriesIndex(series);
-                QChartAxis* axis = m_seriesAxisMap.value(series);
+                if (!index < 0) {
+                    qWarning() << "Can not remove series. Series not found on the chart.";
-                if(!axis){
-                    qWarning()<<"Can not remove series. Series not found on the chart.";
                     return;
                 }
-                emit seriesRemoved(series);
-                m_seriesAxisMap.remove(series);
-                if(series->parent()==this){
+                // Remove the series and the axis from the container
+                QChartAxis* axis = m_seriesAxisList.at(index).second;
+                m_seriesAxisList.removeAt(index);
+                // Delete the series
+                emit seriesRemoved(series);
+                if (series->parent() == this) {
                     delete series;
-                    series=0;
+                    series = 0;
                 }
-                QList<QChartAxis*> axes =  m_seriesAxisMap.values();
+                // Check if the Y axis is still in use
+                bool yAxisInUse(false);
-                int i = axes.indexOf(axis);
+                for (int i(0); i < m_seriesAxisList.count(); i++) {
+                    QPair<QSeries *, QChartAxis *> pair = m_seriesAxisList.at(i);
+                    if (pair.second == axis)
+                        yAxisInUse = true;
+                }
-                if(i==-1){
+                // Remove the Y axis if not in use
+                if (!yAxisInUse) {
                     Domain* domain = m_axisDomainMap.take(axis);
                     emit axisRemoved(axis);
-                    if(axis!=axisY()){
+                    if (axis != axisY()) {
-                        if(axis->parent()==this){
+                        // Delete the Y axis unless it is the default one
+                        if (axis->parent() == this) {
                             delete axis;
-                            axis=0;
+                            axis = 0;
                         }
                     }
                     delete domain;
                 }
-                if(m_seriesAxisMap.values().size()==0)
+                // Remove the x axis in case there are no y-axes left
+                if (m_seriesAxisList.count() == 0) {
-                    m_axisXInitialized=false;
+                    m_axisXInitialized = false;
                     emit axisRemoved(axisX());
                 }
             }
             void ChartDataSet::removeAllSeries()
             {
+                while (m_seriesAxisList.count()) {
-                QList<QSeries*> series =  m_seriesAxisMap.keys();
+                    QPair<QSeries *, QChartAxis *> pair = m_seriesAxisList.last();
+                    removeSeries(pair.first);
-                foreach(QSeries* s , series) {
-                    removeSeries(s);
                 }
-                Q_ASSERT(m_seriesAxisMap.count()==0);
+                Q_ASSERT(m_seriesAxisList.count() == 0);
-                Q_ASSERT(m_axisDomainMap.count()==0);
+                Q_ASSERT(m_axisDomainMap.count() == 0);
             }
             //to be removed with PIMPL
                 }
             }
-            int ChartDataSet::seriesCount(QSeries::QSeriesType type)
+            int ChartDataSet::seriesIndex(QSeries *series) const
-                int count=0;
-                QMapIterator<QSeries*, QChartAxis*> i(m_seriesAxisMap);
-                while (i.hasNext()) {
-                       i.next();
-                       if(i.key()->type()==type) count++;
-                return count;
-            int ChartDataSet::seriesIndex(QSeries *series)
             {
-                int count=-1;
+                for (int i(0); i < m_seriesAxisList.count(); i++) {
-                QMapIterator<QSeries*, QChartAxis*> i(m_seriesAxisMap);
+                    QPair<QSeries *, QChartAxis *> pair = m_seriesAxisList.at(i);
-                while (i.hasNext()) {
+                    if (pair.first == series)
-                    i.next();
+                        return i;
-                    count++;
-                    if (i.key() == series)
-                        return count;
                 }
-                return count;
+                return -1;
             }
             QChartAxis* ChartDataSet::axisY(QSeries* series) const
             {
-                if(series == 0) return m_axisY;
+                if (series == 0)
-                return m_seriesAxisMap.value(series);
+                    return m_axisY;
+                return m_seriesAxisList.at(seriesIndex(series)).second;
             }
             Domain* ChartDataSet::domain(QSeries* series) const
             {
-            	QChartAxis* axis = m_seriesAxisMap.value(series);
+                QChartAxis* axis = m_seriesAxisList.at(seriesIndex(series)).second;
-            	if(axis){
+                if (axis)
             		return m_axisDomainMap.value(axis);
-            	}else
+                return 0;
-            		return 0;
             }
             Domain* ChartDataSet::domain(QChartAxis* axis) const

src/chartdataset_p.h +2 -3

                 void zoomOutDomain(const QRectF& rect, const QSizeF& size);
                 void scrollDomain(int dx,int dy,const QSizeF& size);
-                int seriesCount(QSeries::QSeriesType type);
+                int seriesIndex(QSeries *series) const;
-                int seriesIndex(QSeries *series);
                 Domain* domain(QSeries* series) const;
                 Domain* domain(QChartAxis* axis) const;
                 void setupCategories(QBarSeries* series);
             private:
-                QMap<QSeries*, QChartAxis*> m_seriesAxisMap;
+                QList<QPair<QSeries*, QChartAxis*> > m_seriesAxisList;
                 QMap<QChartAxis*, Domain*> m_axisDomainMap;
                 QChartAxis* m_axisX;
                 QChartAxis* m_axisY;

test/auto/chartdataset/tst_chartdataset.cpp 0 -36

@@ -52,8 +52,6 private Q_SLOTS:
52	void removeAllSeries();	52	void removeAllSeries();
53	void axisY_data();	53	void axisY_data();
54	void axisY();	54	void axisY();
55	void seriesCount_data();
56	void seriesCount();
57	void seriesIndex_data();	55	void seriesIndex_data();
58	void seriesIndex();	56	void seriesIndex();
59	void domain_data();	57	void domain_data();
@@ -261,40 +259,6 void tst_ChartDataSet::axisY()
261		259
262	}	260	}
263		261
264	void tst_ChartDataSet::seriesCount_data()
265	{
266	addSeries_data();
267	}
268
269	void tst_ChartDataSet::seriesCount()
270	{
271	QFETCH(QLineSeries*, series0);
272	QFETCH(QChartAxis*, axis0);
273	QFETCH(QLineSeries*, series1);
274	QFETCH(QChartAxis*, axis1);
275	QFETCH(QLineSeries*, series2);
276	QFETCH(QChartAxis*, axis2);
277	QFETCH(int, axisCount);
278	Q_UNUSED(axisCount);
279
280	ChartDataSet dataSet;
281
282	dataSet.addSeries(series0, axis0);
283	dataSet.addSeries(series1, axis1);
284	dataSet.addSeries(series2, axis2);
285
286	QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis,Domain)));
287	QSignalSpy spy1(&dataSet, SIGNAL(axisRemoved(QChartAxis*)));
288	QSignalSpy spy2(&dataSet, SIGNAL(seriesAdded(QSeries,Domain)));
289	QSignalSpy spy3(&dataSet, SIGNAL(seriesRemoved(QSeries*)));
290
291	QCOMPARE(dataSet.seriesCount(series0->type()),3);
292	QCOMPARE(spy0.count(), 0);
293	QCOMPARE(spy1.count(), 0);
294	QCOMPARE(spy2.count(), 0);
295	QCOMPARE(spy3.count(), 0);
296	}
297
298	void tst_ChartDataSet::seriesIndex_data()	262	void tst_ChartDataSet::seriesIndex_data()
299	{	263	{
300	addSeries_data();	264	addSeries_data();

test/chartwidgettest/mainwidget.cpp +3 0

                     for (int j(0); j < data.count(); j ++) {
                         QList<qreal> column = data.at(j);
                         QLineSeries *series = new QLineSeries();
+                        series->setName("line" + QString::number(j));
                         for (int i(0); i < column.count(); i++)
                             series->append(i, column.at(i));
                         m_chart->addSeries(series);
                         for (int i(0); i < column.count(); i++)
                             lineSeries->append(i, column.at(i));
                         QAreaSeries *areaSeries = new QAreaSeries(lineSeries);
+                        areaSeries->setName("area" + QString::number(j));
                         m_chart->addSeries(areaSeries);
                     }
                 } else if (seriesName == "Scatter") {
                     for (int j(0); j < data.count(); j++) {
                         QList<qreal> column = data.at(j);
                         QScatterSeries *series = new QScatterSeries();
+                        series->setName("scatter" + QString::number(j));
                         for (int i(0); i < column.count(); i++)
                             series->append(i, column.at(i));
                         m_chart->addSeries(series);

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