HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r562:f23c0d74d416

Fix theme decoration calls on all xyseries

Michal Klocek -

r562:f23c0d74d416

parent child

Context file:

r562:f23c0d74d416

Collapse all files

src/chartpresenter.cpp +7 -5

                 }
                 if(axis==m_dataset->axisX()){
+                    m_chartTheme->decorate(axis,true);
                     QObject::connect(domain,SIGNAL(rangeXChanged(qreal,qreal,int)),item,SLOT(handleRangeChanged(qreal,qreal,int)));
                     //initialize
                     item->handleRangeChanged(domain->minX(),domain->maxX(),domain->tickXCount());
                 }
                 else{
+                    m_chartTheme->decorate(axis,false);
                     QObject::connect(domain,SIGNAL(rangeYChanged(qreal,qreal,int)),item,SLOT(handleRangeChanged(qreal,qreal,int)));
                     //initialize
                     item->handleRangeChanged(domain->minY(),domain->maxY(),domain->tickYCount());
                 QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&)));
                 //initialize
                 item->handleGeometryChanged(m_rect);
-                m_chartTheme->decorate(axis, m_chart);
                 m_axisItems.insert(axis, item);
             }
                     if(m_options.testFlag(QChart::SeriesAnimations)) {
                     	m_animator->addAnimation(line);
                     }
-                    m_chartTheme->decorate(line, lineSeries, m_dataset->seriesIndex(series));
+                    m_chartTheme->decorate(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;
                        m_animator->addAnimation(area->upperLineItem());
                        if(areaSeries->lowerSeries())  m_animator->addAnimation(area->lowerLineItem());
                     }
-                    m_chartTheme->decorate(area, areaSeries, m_dataset->seriesIndex(series));
+                    m_chartTheme->decorate(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(scatter);
                         }
-                        m_chartTheme->decorate(scatter, scatterSeries, m_dataset->seriesIndex(series));
+                        m_chartTheme->decorate(scatterSeries, m_dataset->seriesIndex(series));
                         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(spline);
                     }
-                    m_chartTheme->decorate(spline, splineSeries, m_dataset->seriesIndex(series));
+                    m_chartTheme->decorate(splineSeries, m_dataset->seriesIndex(series));
                     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;

src/charttheme.cpp +10 -31

                 legend->setBackgroundBrush(m_backgroundGradient);
             }
-            void ChartTheme::decorate(AreaChartItem* item, QAreaSeries* series, int index)
+            void ChartTheme::decorate(QAreaSeries* series, int index)
             {
                 QPen pen;
                 QBrush brush;
             }
-            void ChartTheme::decorate(LineChartItem* item, QLineSeries* series,int index)
+            void ChartTheme::decorate(QLineSeries* series,int index)
             {
                 QPen pen;
                 if(pen == series->pen()){
                 }
             }
-            void ChartTheme::decorate(ScatterChartItem* item, QScatterSeries* series, int index)
+            void ChartTheme::decorate(QScatterSeries* series, int index)
             {
-                Q_ASSERT(item);
-                Q_ASSERT(series);
                 QPen pen;
                 QBrush brush;
                 }
             }
-            void ChartTheme::decorate(SplineChartItem* item, QSplineSeries* series, int index)
+            void ChartTheme::decorate(QSplineSeries* series, int index)
             {
-                Q_ASSERT(item);
-                Q_ASSERT(series);
                 QPen pen;
-                if(pen != series->pen()){
+                if(pen == series->pen()){
-                    item->setLinePen(series->pen());
-                }else{
                     pen.setColor(m_seriesColors.at(index%m_seriesColors.size()));
-                    pen.setWidthF(series->pen().widthF());
+                    pen.setWidthF(2);
-                    item->setLinePen(series->pen());
+                    series->setPen(pen);
                 }
-            //    QColor color = m_seriesColors.at(index % m_seriesColors.size());
-                // TODO: define alpha in the theme? or in the series?
-                //color.setAlpha(120);
-            //    QBrush brush(color, Qt::SolidPattern);
-            //    presenter->m_markerBrush = brush;
-            //    QPen pen(brush, 3);
-            //    pen.setColor(color);
-            //    presenter->m_markerPen = pen;
             }
-            void ChartTheme::decorate(QChartAxis* axis, QChart* parent)
+            void ChartTheme::decorate(QChartAxis* axis,bool axisX)
             {
-                Q_ASSERT(axis);
-                Q_ASSERT(parent);
                 if (axis->isAxisVisible()) {
                     axis->setLabelsBrush(m_axisLabelBrush);
                     axis->setLabelsPen(m_axisLabelPen);
                     // TODO: check the axis type (x or y) should define whether to show the shades or not
                     if (m_backgroundShades == BackgroundShadesBoth
-                            || (m_backgroundShades == BackgroundShadesVertical && parent->axisX() == axis)
+                            || (m_backgroundShades == BackgroundShadesVertical && axisX)
-                            || (m_backgroundShades == BackgroundShadesHorizontal && parent->axisY() == axis)) {
+                            || (m_backgroundShades == BackgroundShadesHorizontal && !axisX)) {
                         axis->setShadesPen(m_backgroundShadesPen);
                         axis->setShadesBrush(m_backgroundShadesBrush);
                     } else {

src/charttheme_p.h +5 -5

                 void decorate(BarPresenter* item, QBarSeries* series, int index);
                 void decorate(StackedBarPresenter* item, QStackedBarSeries* series, int index);
                 void decorate(PercentBarPresenter* item, QPercentBarSeries* series, int index);
-                void decorate(LineChartItem* item, QLineSeries* series, int index);
+                void decorate(QLineSeries* series, int index);
-                void decorate(AreaChartItem* item, QAreaSeries* series, int index);
+                void decorate(QAreaSeries* series, int index);
-                void decorate(ScatterChartItem* presenter, QScatterSeries* series, int index);
+                void decorate(QScatterSeries* series, int index);
                 void decorate(PiePresenter* item, QPieSeries* series, int index);
-                void decorate(SplineChartItem* presenter, QSplineSeries* series, int index);
+                void decorate(QSplineSeries* series, int index);
-                void decorate(QChartAxis* axis, QChart* parent);
+                void decorate(QChartAxis* axis, bool axisX);
             public: // utils
                 void generateSeriesGradients();

src/splinechart/splinechartitem.cpp +1 -6

                 XYChartItem::setLayout(points);
             }
-            void SplineChartItem::setLinePen(const QPen& pen)
-                m_pen = pen;
             //handlers
             void SplineChartItem::handleUpdated()
             {
                 //m_items.setVisible(m_series->pointsVisible());
-                setLinePen(m_series->pen());
+                m_pen = m_series->pen();
                 update();
             }

src/splinechart/splinechartitem_p.h 0 -1

                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
                 QPainterPath shape() const;
-                void setLinePen(const QPen& pen);
                 void setPointsVisible(bool visible);
             public slots:

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