##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Now using either vertical or horizontal grid shades
Tero Ahola -
r561:9e8d1d9c7f49
parent child
Show More
Show file before | Show file after | Hide comments
@@ -118,9 +118,8 void ChartPresenter::handleAxisAdded(QChartAxis* axis,Domain* domain)
118 118 QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&)));
119 119 //initialize
120 120 item->handleGeometryChanged(m_rect);
121 m_chartTheme->decorate(axis,item);
122 m_axisItems.insert(axis,item);
123
121 m_chartTheme->decorate(axis, m_chart);
122 m_axisItems.insert(axis, item);
124 123 }
125 124
126 125 void ChartPresenter::handleAxisRemoved(QChartAxis* axis)
Show file before | Show file after | Hide comments
@@ -218,18 +218,18 void ChartTheme::decorate(SplineChartItem* item, QSplineSeries* series, int inde
218 218 // presenter->m_markerPen = pen;
219 219 }
220 220
221 void ChartTheme::decorate(QChartAxis* axis, AxisItem* item)
221 void ChartTheme::decorate(QChartAxis* axis, QChart* parent)
222 222 {
223 223 Q_ASSERT(axis);
224 Q_ASSERT(item);
224 Q_ASSERT(parent);
225 225
226 226 if (axis->isAxisVisible()) {
227 227 axis->setLabelsBrush(m_axisLabelBrush);
228 228 axis->setLabelsPen(m_axisLabelPen);
229 229 // TODO: check the axis type (x or y) should define whether to show the shades or not
230 230 if (m_backgroundShades == BackgroundShadesBoth
231 || m_backgroundShades == BackgroundShadesVertical /*&& x axis ?*/
232 || m_backgroundShades == BackgroundShadesHorizontal /* && y axis*/) {
231 || (m_backgroundShades == BackgroundShadesVertical && parent->axisX() == axis)
232 || (m_backgroundShades == BackgroundShadesHorizontal && parent->axisY() == axis)) {
233 233 axis->setShadesPen(m_backgroundShadesPen);
234 234 axis->setShadesBrush(m_backgroundShadesBrush);
235 235 } else {
Show file before | Show file after | Hide comments
@@ -53,7 +53,7 public:
53 53 void decorate(ScatterChartItem* presenter, QScatterSeries* series, int index);
54 54 void decorate(PiePresenter* item, QPieSeries* series, int index);
55 55 void decorate(SplineChartItem* presenter, QSplineSeries* series, int index);
56 void decorate(QChartAxis* axis, AxisItem* item);
56 void decorate(QChartAxis* axis, QChart* parent);
57 57
58 58 public: // utils
59 59 void generateSeriesGradients();
Show file before | Show file after | Hide comments
@@ -28,6 +28,9 public:
28 28 m_axisLabelBrush = QBrush(QRgb(0x3f3f3f));
29 29 m_axisLabelPen = Qt::NoPen; // NoPen for performance reasons
30 30 m_backgroundShadesPen = Qt::NoPen;
31 // m_backgroundShadesBrush = QBrush(QColor(0x0f, 0x0f, 0x0f, 0x80));
32 m_backgroundShadesBrush = QBrush(QColor(0xff, 0xad, 0x00, 0x50));
33 m_backgroundShades = BackgroundShadesHorizontal;
31 34 m_gridLinePen = QPen(QRgb(0x0f0f0f));
32 35 m_gridLinePen.setWidth(2);
33 36 }
General Comments 0
You need to be logged in to leave comments. Login now