HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r533:3b56d6625202

Adds proper series counter for theme initialization

Michal Klocek -

r533:3b56d6625202

parent child

Context file:

r533:3b56d6625202

Collapse all files

src/chartdataset.cpp +11 0

@@ -247,6 +247,17 void ChartDataSet::zoomOutDomain(const QRectF& rect, const QSizeF& size)
247	}	247	}
248	}	248	}
249		249
		250	int ChartDataSet::seriesCount(QSeries::QSeriesType type)
		251	{
		252	int count=0;
		253	QMapIterator<QSeries, QChartAxis> i( m_seriesAxisMap);
		254	while (i.hasNext()) {
		255	i.next();
		256	if(i.key()->type()==type) count++;
		257	}
		258	return count;
		259	}
		260
250	QChartAxis* ChartDataSet::axisY(QSeries* series) const	261	QChartAxis* ChartDataSet::axisY(QSeries* series) const
251	{	262	{
252	if(series == 0) return m_axisY;	263	if(series == 0) return m_axisY;

src/chartdataset_p.h +2 0

                 void zoomOutDomain(const QRectF& rect, const QSizeF& size);
                 void scrollDomain(int dx,int dy,const QSizeF& size);
+                int seriesCount(QSeries::QSeriesType type);
                 Domain* domain(QSeries* series) const;
                 Domain* domain(QChartAxis* axis) const;
                 QChartAxis* axis(QSeries* series) const;

src/chartpresenter.cpp +8 -8

                     if(m_options.testFlag(QChart::SeriesAnimations)) {
                     	m_animator->addAnimation(line);
                     }
-                    m_chartTheme->decorate(line,lineSeries,m_chartItems.count());
+                    m_chartTheme->decorate(line,lineSeries,m_dataset->seriesCount(series->type()));
                     QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),line,SLOT(handleGeometryChanged(const QRectF&)));
                     QObject::connect(domain,SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),line,SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
                     item = line;
                     if(m_options.testFlag(QChart::SeriesAnimations)) {
                       //  m_animator->addAnimation(area);
                     }
-                    m_chartTheme->decorate(area,areaSeries,m_chartItems.count());
+                    m_chartTheme->decorate(area,areaSeries,m_dataset->seriesCount(series->type()));
                     QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),area,SLOT(handleGeometryChanged(const QRectF&)));
                     QObject::connect(domain,SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),area,SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
                     item=area;
                     if(m_options.testFlag(QChart::SeriesAnimations)) {
                      //  m_animator->addAnimation(bar);
                     }
-                    m_chartTheme->decorate(bar,barSeries,m_chartItems.count());
+                    m_chartTheme->decorate(bar,barSeries,m_dataset->seriesCount(series->type()));
                     QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),bar,SLOT(handleGeometryChanged(const QRectF&)));
                     QObject::connect(domain,SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),bar,SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
                     item=bar;
                     if(m_options.testFlag(QChart::SeriesAnimations)) {
                      //  m_animator->addAnimation(bar);
                     }
-                    m_chartTheme->decorate(bar,stackedBarSeries,m_chartItems.count());
+                    m_chartTheme->decorate(bar,stackedBarSeries,m_dataset->seriesCount(series->type()));
                     QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),bar,SLOT(handleGeometryChanged(const QRectF&)));
                     QObject::connect(domain,SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),bar,SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
                     item=bar;
                     if(m_options.testFlag(QChart::SeriesAnimations)) {
                      //  m_animator->addAnimation(bar);
                     }
-                    m_chartTheme->decorate(bar,percentBarSeries ,m_chartItems.count());
+                    m_chartTheme->decorate(bar,percentBarSeries ,m_dataset->seriesCount(series->type()));
                     QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),bar,SLOT(handleGeometryChanged(const QRectF&)));
                     QObject::connect(domain,SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),bar,SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
                     item=bar;
             		if(m_options.testFlag(QChart::SeriesAnimations)) {
             		    m_animator->addAnimation(scatter);
             		}
-            		m_chartTheme->decorate(scatter, scatterSeries, m_chartItems.count());
+            		m_chartTheme->decorate(scatter, scatterSeries, m_dataset->seriesCount(series->type()));
             		QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),scatter,SLOT(handleGeometryChanged(const QRectF&)));
             		QObject::connect(domain,SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),scatter,SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
             		item=scatter;
                     if(m_options.testFlag(QChart::SeriesAnimations)) {
                        // m_animator->addAnimation(pie);
                     }
-                    m_chartTheme->decorate(pie, pieSeries, m_chartItems.count());
+                    m_chartTheme->decorate(pie, pieSeries, m_dataset->seriesCount(series->type()));
                     QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),pie,SLOT(handleGeometryChanged(const QRectF&)));
                     QObject::connect(domain,SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),pie,SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
                     // Hide all from background when there is only piechart
             			if(m_options.testFlag(QChart::SeriesAnimations)) {
             			    m_animator->addAnimation(spline);
             			}
-            			m_chartTheme->decorate(spline, splineSeries, m_chartItems.count());
+            			m_chartTheme->decorate(spline, splineSeries, m_dataset->seriesCount(series->type()));
             			QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),spline,SLOT(handleGeometryChanged(const QRectF&)));
             			QObject::connect(domain,SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),spline,SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
             			item=spline;

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