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

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

Bugfix dangling pointer in qlegend, remove debug info
Michal Klocek -
r572:1af1de97a8a5
parent child
Show More
Show file before | Show file after | Hide comments
@@ -42,33 +42,36 int main(int argc, char *argv[])
42
42
43 QLinearGradient backgroundGradient;
43 QLinearGradient backgroundGradient;
44 backgroundGradient.setColorAt(0.0, Qt::white);
44 backgroundGradient.setColorAt(0.0, Qt::white);
45 backgroundGradient.setColorAt(1.0, QRgb(0xffff80));
45 backgroundGradient.setColorAt(1.0, Qt::white);
46 backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
46 backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
47 chartView->setChartBackgroundBrush(backgroundGradient);
47 chartView->setChartBackgroundBrush(backgroundGradient);
48
48
49 QChartAxis* axisX = chartView->axisX();
49 QChartAxis* axisX = chartView->axisX();
50 axisX->setLabelsAngle(45);
50 axisX->setLabelsAngle(45);
51 axisX->setGridLinePen(Qt::DashLine);
51 axisX->setGridLinePen(red);
52 axisX->setGridLineVisible(false);
53 axisX->setShadesVisible(true);
52
54
53 QChartAxisCategories* categoriesX = axisX->categories();
55 QChartAxisCategories* categoriesX = axisX->categories();
54 categoriesX->insert(0,"low");
56 categoriesX->insert(0,"low");
55 categoriesX->insert(50,"medium");
57 categoriesX->insert(50,"medium");
56 categoriesX->insert(100,"High");
58 categoriesX->insert(100,"High");
57
59
58 axisX->setMin(-10);
60 // axisX->setMin(-10);
59 axisX->setMax(2200);
61 // axisX->setMax(2200);
60
62
61 QChartAxis* axisY = chartView->axisY();
63 QChartAxis* axisY = chartView->axisY();
62 axisY->setLabelsAngle(45);
64 axisY->setLabelsAngle(45);
63 axisY->setShadesBrush(Qt::yellow);
65 axisY->setShadesBrush(Qt::yellow);
66 axisY->setGridLineVisible(false);
64
67
65 QChartAxisCategories* categoriesY = axisY->categories();
68 QChartAxisCategories* categoriesY = axisY->categories();
66 categoriesY->insert(0,"low");
69 categoriesY->insert(0,"low");
67 categoriesY->insert(50,"medium");
70 categoriesY->insert(50,"medium");
68 categoriesY->insert(100,"High");
71 categoriesY->insert(100,"High");
69
72
70 axisY->setMin(-10);
73 // axisY->setMin(-10);
71 axisY->setMax(200);
74 // axisY->setMax(200);
72
75
73 window.setCentralWidget(chartView);
76 window.setCentralWidget(chartView);
74 window.resize(400, 300);
77 window.resize(400, 300);
Show file before | Show file after | Hide comments
@@ -70,6 +70,7 void QLegend::handleSeriesAdded(QSeries* series,Domain* domain)
70
70
71 QAreaSeries* areaSeries = static_cast<QAreaSeries*>(series);
71 QAreaSeries* areaSeries = static_cast<QAreaSeries*>(series);
72 createMarker(areaSeries->upperSeries());
72 createMarker(areaSeries->upperSeries());
73 if(areaSeries->lowerSeries())
73 createMarker(areaSeries->lowerSeries());
74 createMarker(areaSeries->lowerSeries());
74 break;
75 break;
75 }
76 }
@@ -190,8 +191,6 void QLegend::layoutChanged()
190 qreal x = mBoundingRect.x() + 5;
191 qreal x = mBoundingRect.x() + 5;
191 qreal y = mBoundingRect.y() + (mBoundingRect.height() - markerSize.height())/2;
192 qreal y = mBoundingRect.y() + (mBoundingRect.height() - markerSize.height())/2;
192 foreach (LegendMarker* m, mMarkers) {
193 foreach (LegendMarker* m, mMarkers) {
193 qDebug() << "marker x:" << x;
194 qDebug() << "marker y:" << y;
195 m->setBoundingRect(QRectF(x,y,markerSize.width(),markerSize.height()));
194 m->setBoundingRect(QRectF(x,y,markerSize.width(),markerSize.height()));
196 x += xStep;
195 x += xStep;
197 }
196 }
General Comments 0
You need to be logged in to leave comments. Login now