HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r561:9e8d1d9c7f49

Now using either vertical or horizontal grid shades

Tero Ahola -

r561:9e8d1d9c7f49

parent child

Context file:

r561:9e8d1d9c7f49

src/chartpresenter.cpp +2 -3

                 QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&)));
                 //initialize
                 item->handleGeometryChanged(m_rect);
-                m_chartTheme->decorate(axis,item);
+                m_chartTheme->decorate(axis, m_chart);
-                m_axisItems.insert(axis,item);
+                m_axisItems.insert(axis, item);
             }
             void ChartPresenter::handleAxisRemoved(QChartAxis* axis)

src/charttheme.cpp +4 -4

             //    presenter->m_markerPen = pen;
             }
-            void ChartTheme::decorate(QChartAxis* axis, AxisItem* item)
+            void ChartTheme::decorate(QChartAxis* axis, QChart* parent)
             {
                 Q_ASSERT(axis);
-                Q_ASSERT(item);
+                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 /*&& x axis ?*/
+                            || (m_backgroundShades == BackgroundShadesVertical && parent->axisX() == axis)
-                            || m_backgroundShades == BackgroundShadesHorizontal /* && y axis*/) {
+                            || (m_backgroundShades == BackgroundShadesHorizontal && parent->axisY() == axis)) {
                         axis->setShadesPen(m_backgroundShadesPen);
                         axis->setShadesBrush(m_backgroundShadesBrush);
                     } else {

src/charttheme_p.h +1 -1

                 void decorate(ScatterChartItem* presenter, QScatterSeries* series, int index);
                 void decorate(PiePresenter* item, QPieSeries* series, int index);
                 void decorate(SplineChartItem* presenter, QSplineSeries* series, int index);
-                void decorate(QChartAxis* axis, AxisItem* item);
+                void decorate(QChartAxis* axis, QChart* parent);
             public: // utils
                 void generateSeriesGradients();

src/themes/chartthemescientific_p.h +3 0

                     m_axisLabelBrush = QBrush(QRgb(0x3f3f3f));
                     m_axisLabelPen = Qt::NoPen; // NoPen for performance reasons
                     m_backgroundShadesPen = Qt::NoPen;
+            //        m_backgroundShadesBrush = QBrush(QColor(0x0f, 0x0f, 0x0f, 0x80));
+                    m_backgroundShadesBrush = QBrush(QColor(0xff, 0xad, 0x00, 0x50));
+                    m_backgroundShades = BackgroundShadesHorizontal;
                     m_gridLinePen = QPen(QRgb(0x0f0f0f));
                     m_gridLinePen.setWidth(2);
                 }

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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