HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r538:3b2495c81f70

Fixed bug with changing theme when several series exist

Tero Ahola -

r538:3b2495c81f70

parent child

Context file:

r538:3b2495c81f70

Collapse all files

src/chartdataset.cpp +13 0

@@ -258,6 +258,19 int ChartDataSet::seriesCount(QSeries::QSeriesType type)
258	return count;	258	return count;
259	}	259	}
260		260
		261	int ChartDataSet::seriesIndex(QSeries *series)
		262	{
		263	int count(-1);
		264	QMapIterator<QSeries, QChartAxis> i(m_seriesAxisMap);
		265	while (i.hasNext()) {
		266	i.next();
		267	count++;
		268	if (i.key() == series)
		269	return count;
		270	}
		271	return count;
		272	}
		273
261	QChartAxis* ChartDataSet::axisY(QSeries* series) const	274	QChartAxis* ChartDataSet::axisY(QSeries* series) const
262	{	275	{
263	if(series == 0) return m_axisY;	276	if(series == 0) return m_axisY;

src/chartdataset_p.h +1 0

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

src/chartpresenter.cpp +26 -27

                     if(m_options.testFlag(QChart::SeriesAnimations)) {
                     	m_animator->addAnimation(line);
                     }
-                    m_chartTheme->decorate(line,lineSeries,m_dataset->seriesCount(series->type()));
+                    m_chartTheme->decorate(line, lineSeries, m_dataset->seriesIndex(series));
                     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_dataset->seriesCount(series->type()));
+                    m_chartTheme->decorate(area, areaSeries, m_dataset->seriesIndex(series));
                     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_dataset->seriesCount(series->type()));
+                    m_chartTheme->decorate(bar, barSeries, m_dataset->seriesIndex(barSeries));
                     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_dataset->seriesCount(series->type()));
+                    m_chartTheme->decorate(bar, stackedBarSeries, m_dataset->seriesIndex(stackedBarSeries));
                     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_dataset->seriesCount(series->type()));
+                    m_chartTheme->decorate(bar, percentBarSeries, m_dataset->seriesIndex(percentBarSeries));
                     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;
                 case QSeries::SeriesTypeScatter: {
                 	QScatterSeries *scatterSeries = static_cast<QScatterSeries *>(series);
-            		ScatterChartItem *scatter = new ScatterChartItem(scatterSeries, m_chart);
+                        ScatterChartItem *scatter = new ScatterChartItem(scatterSeries, m_chart);
-            		if(m_options.testFlag(QChart::SeriesAnimations)) {
+                        if(m_options.testFlag(QChart::SeriesAnimations)) {
-            		    m_animator->addAnimation(scatter);
+                            m_animator->addAnimation(scatter);
+                        }
-            		m_chartTheme->decorate(scatter, scatterSeries, m_dataset->seriesCount(series->type()));
+                        m_chartTheme->decorate(scatter, scatterSeries, m_dataset->seriesIndex(series));
-            		QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),scatter,SLOT(handleGeometryChanged(const QRectF&)));
+                        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)));
+                        QObject::connect(domain,SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),scatter,SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
-            		item=scatter;
+                        item = scatter;
-            		break;
+                        break;
             	}
                 case QSeries::SeriesTypePie: {
                     if(m_options.testFlag(QChart::SeriesAnimations)) {
                        // m_animator->addAnimation(pie);
                     }
-                    m_chartTheme->decorate(pie, pieSeries, m_dataset->seriesCount(series->type()));
+                    m_chartTheme->decorate(pie, pieSeries, m_dataset->seriesIndex(series));
                     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
                 }
                 case QSeries::SeriesTypeSpline: {
+                    QSplineSeries* splineSeries = static_cast<QSplineSeries*>(series);
-            			QSplineSeries* splineSeries = static_cast<QSplineSeries*>(series);
+                    SplineChartItem* spline  = new SplineChartItem(splineSeries, m_chart);
-            			SplineChartItem* spline  = new SplineChartItem(splineSeries, m_chart);
+                    if(m_options.testFlag(QChart::SeriesAnimations)) {
-            			if(m_options.testFlag(QChart::SeriesAnimations)) {
+                        m_animator->addAnimation(spline);
-            			    m_animator->addAnimation(spline);
+                    m_chartTheme->decorate(spline, splineSeries, m_dataset->seriesIndex(series));
-            			m_chartTheme->decorate(spline, splineSeries, m_dataset->seriesCount(series->type()));
+                    QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),spline,SLOT(handleGeometryChanged(const QRectF&)));
-            			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)));
-            			QObject::connect(domain,SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),spline,SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
+                    item=spline;
-            			item=spline;
+                    break;
-            			break;
                 default: {
                     qDebug()<< "Series type" << series->type() << "not implemented.";
                     break;

src/charttheme.cpp +26 -26

                 chart->setChartBackgroundBrush(m_backgroundGradient);
             }
-            void ChartTheme::decorate(AreaChartItem* item, QAreaSeries* series,int count)
+            void ChartTheme::decorate(AreaChartItem* item, QAreaSeries* series, int index)
             {
                 QPen pen;
                 QBrush brush;
                 if (pen != series->pen()){
                    item->setPen(series->pen());
                 } else {
-                    pen.setColor(colorAt(m_seriesGradients.at(count % m_seriesGradients.size()), 1.0));
+                    pen.setColor(colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 1.0));
                     pen.setWidthF(2);
                     item->setPen(pen);
                 }
                 if (brush != series->brush()) {
                    item->setBrush(series->brush());
                 } else {
-                   QBrush brush(m_seriesColors.at(count % m_seriesColors.size()));
+                   QBrush brush(m_seriesColors.at(index % m_seriesColors.size()));
                    item->setBrush(brush);
                 }
             }
-            void ChartTheme::decorate(LineChartItem* item, QLineSeries* series,int count)
+            void ChartTheme::decorate(LineChartItem* item, QLineSeries* series,int index)
             {
                 QPen pen;
                 if(pen != series->pen()){
                     item->setLinePen(series->pen());
                     return;
                 }
-                pen.setColor(m_seriesColors.at(count%m_seriesColors.size()));
+                pen.setColor(m_seriesColors.at(index%m_seriesColors.size()));
                 pen.setWidthF(2);
                 item->setLinePen(pen);
             }
-            void ChartTheme::decorate(BarPresenter* item, QBarSeries* series,int count)
+            void ChartTheme::decorate(BarPresenter* item, QBarSeries* series,int index)
             {
                 QList<QBarSet*> sets = series->barSets();
                 for (int i=0; i<sets.count(); i++) {
                     qreal pos = 0.5;
                     if (sets.count() > 1)
                         pos = (qreal) i / (qreal) (sets.count() - 1);
-                    QColor c = colorAt(m_seriesGradients.at(count % m_seriesGradients.size()), pos);
+                    QColor c = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), pos);
                     sets.at(i)->setBrush(QBrush(c));
                     // Pick label color as far as possible from bar color (within gradient).
                     // 0.3 is magic number that was picked as value that gave enough contrast with icy theme gradient :)
                     // TODO: better picking of label color?
                     if (pos < 0.3) {
-                        c = colorAt(m_seriesGradients.at(count % m_seriesGradients.size()), 1);
+                        c = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 1);
                     } else {
-                        c = colorAt(m_seriesGradients.at(count % m_seriesGradients.size()), 0);
+                        c = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 0);
                     }
                     sets.at(i)->setFloatingValuePen(QPen(c));
                 }
             }
-            void ChartTheme::decorate(StackedBarPresenter* item, QStackedBarSeries* series,int count)
+            void ChartTheme::decorate(StackedBarPresenter* item, QStackedBarSeries* series,int index)
             {
                 QList<QBarSet*> sets = series->barSets();
                 for (int i=0; i<sets.count(); i++) {
                     qreal pos = 0.5;
                     if (sets.count() > 1)
                         pos = (qreal) i / (qreal) (sets.count() - 1);
-                    QColor c = colorAt(m_seriesGradients.at(count % m_seriesGradients.size()), pos);
+                    QColor c = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), pos);
                     sets.at(i)->setBrush(QBrush(c));
                     if (pos < 0.3) {
-                        c = colorAt(m_seriesGradients.at(count % m_seriesGradients.size()), 1);
+                        c = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 1);
                     } else {
-                        c = colorAt(m_seriesGradients.at(count % m_seriesGradients.size()), 0);
+                        c = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 0);
                     }
                     sets.at(i)->setFloatingValuePen(QPen(c));
                 }
             }
-            void ChartTheme::decorate(PercentBarPresenter* item, QPercentBarSeries* series,int count)
+            void ChartTheme::decorate(PercentBarPresenter* item, QPercentBarSeries* series,int index)
             {
                 QList<QBarSet*> sets = series->barSets();
                 for (int i=0; i<sets.count(); i++) {
                     qreal pos = 0.5;
                     if (sets.count() > 1)
                         pos = (qreal) i / (qreal) (sets.count() - 1);
-                    QColor c = colorAt(m_seriesGradients.at(count % m_seriesGradients.size()), pos);
+                    QColor c = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), pos);
                     sets.at(i)->setBrush(QBrush(c));
                     if (pos < 0.3) {
-                        c = colorAt(m_seriesGradients.at(count % m_seriesGradients.size()), 1);
+                        c = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 1);
                     } else {
-                        c = colorAt(m_seriesGradients.at(count % m_seriesGradients.size()), 0);
+                        c = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 0);
                     }
                     sets.at(i)->setFloatingValuePen(QPen(c));
                 }
             }
-            void ChartTheme::decorate(ScatterChartItem* item, QScatterSeries* series, int count)
+            void ChartTheme::decorate(ScatterChartItem* item, QScatterSeries* series, int index)
             {
                 Q_ASSERT(item);
                 Q_ASSERT(series);
                 // Use a base color for brush
-                item->setBrush(m_seriesColors.at(count % m_seriesColors.size()));
+                item->setBrush(m_seriesColors.at(index % m_seriesColors.size()));
                 // Take pen near from gradient start, effectively using a lighter color for outline
                 QPen pen(QBrush(Qt::SolidPattern), 3);
-                pen.setColor(colorAt(m_seriesGradients.at(count % m_seriesGradients.size()), 1.0));
+                pen.setColor(colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 1.0));
                 item->setPen(pen);
             }
-            void ChartTheme::decorate(PiePresenter* item, QPieSeries* series, int count)
+            void ChartTheme::decorate(PiePresenter* item, QPieSeries* series, int index)
             {
                 // Get color for a slice from a gradient linearly, beginning from the start of the gradient
                 for (int i(0); i < series->slices().count(); i++) {
                     qreal pos = (qreal) i / (qreal) series->count();
-                    QColor penColor = colorAt(m_seriesGradients.at(count % m_seriesGradients.size()), 0.1);
+                    QColor penColor = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 0.1);
                     series->slices().at(i)->setSlicePen(penColor);
-                    QColor brushColor = colorAt(m_seriesGradients.at(count % m_seriesGradients.size()), pos);
+                    QColor brushColor = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), pos);
                     series->slices().at(i)->setSliceBrush(brushColor);
                 }
             }
                 axis->setShadesOpacity(0.5);
             }
-            void ChartTheme::decorate(SplineChartItem* item, QSplineSeries* series, int count)
+            void ChartTheme::decorate(SplineChartItem* item, QSplineSeries* series, int index)
             {
                 Q_ASSERT(item);
                 Q_ASSERT(series);
                 if(pen != series->pen()){
                     item->setLinePen(series->pen());
                 }else{
-                    pen.setColor(m_seriesColors.at(count%m_seriesColors.size()));
+                    pen.setColor(m_seriesColors.at(index%m_seriesColors.size()));
                     pen.setWidthF(series->pen().widthF());
                     item->setLinePen(series->pen());
                 }
-            //    QColor color = m_seriesColors.at(count % m_seriesColors.size());
+            //    QColor color = m_seriesColors.at(index % m_seriesColors.size());
                 // TODO: define alpha in the theme? or in the series?
                 //color.setAlpha(120);

src/charttheme_p.h +9 -9

                 static ChartTheme* createTheme(QChart::ChartTheme theme);
                 QChart::ChartTheme id() const {return m_id;}
                 void decorate(QChart* chart);
-                //void decorate(ChartItem* item, QSeries* series,int count);
+                //void decorate(ChartItem* item, QSeries* series,int index);
-                void decorate(BarPresenter* item, QBarSeries* series,int count);
+                void decorate(BarPresenter* item, QBarSeries* series, int index);
-                void decorate(StackedBarPresenter* item, QStackedBarSeries* series,int count);
+                void decorate(StackedBarPresenter* item, QStackedBarSeries* series, int index);
-                void decorate(PercentBarPresenter* item, QPercentBarSeries* series,int count);
+                void decorate(PercentBarPresenter* item, QPercentBarSeries* series, int index);
-                void decorate(LineChartItem* item, QLineSeries* series,int count);
+                void decorate(LineChartItem* item, QLineSeries* series, int index);
-                void decorate(AreaChartItem* item, QAreaSeries* series,int count);
+                void decorate(AreaChartItem* item, QAreaSeries* series, int index);
-                void decorate(ScatterChartItem* presenter, QScatterSeries* series, int count);
+                void decorate(ScatterChartItem* presenter, QScatterSeries* series, int index);
-                void decorate(PiePresenter* item, QPieSeries* series, int count);
+                void decorate(PiePresenter* item, QPieSeries* series, int index);
                 void decorate(QChartAxis* axis,AxisItem* item);
-                void decorate(SplineChartItem* presenter, QSplineSeries* series, int count);
+                void decorate(SplineChartItem* presenter, QSplineSeries* series, int index);
             public: // utils
                 void generateSeriesGradients();

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