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

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

Release compilation fixes
Michal Klocek -
r689:15b9cd07deb2
parent child
Show More
Show file before | Show file after | Hide comments
@@ -10,7 +10,7 QTCOMMERCIALCHART_BEGIN_NAMESPACE
10
10
11 //TODO: optimize : remove points which are not visible
11 //TODO: optimize : remove points which are not visible
12
12
13 AreaChartItem::AreaChartItem(QAreaSeries* areaSeries,ChartPresenter *presenter):Chart(presenter),QGraphicsItem(presenter->rootItem()),
13 AreaChartItem::AreaChartItem(QAreaSeries* areaSeries,ChartPresenter *presenter):ChartItem(presenter),
14 m_series(areaSeries),
14 m_series(areaSeries),
15 m_upper(0),
15 m_upper(0),
16 m_lower(0),
16 m_lower(0),
@@ -99,8 +99,12 void AreaChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *opt
99 Q_UNUSED(option)
99 Q_UNUSED(option)
100
100
101 painter->save();
101 painter->save();
102 painter->setPen(m_linePen);
102 QPen pen;
103 painter->setBrush(m_brush);
103 pen.setCosmetic(false);
104 pen.setWidth(4);
105 pen.setColor(qRgb(200,0,250));
106 painter->setPen(pen);
107 //painter->setBrush(m_brush);
104 painter->setClipRect(m_clipRect);
108 painter->setClipRect(m_clipRect);
105 painter->drawPath(m_path);
109 painter->drawPath(m_path);
106 if(m_pointsVisible){
110 if(m_pointsVisible){
Show file before | Show file after | Hide comments
@@ -10,7 +10,7 QTCOMMERCIALCHART_BEGIN_NAMESPACE
10 class QAreaSeries;
10 class QAreaSeries;
11 class AreaChartItem;
11 class AreaChartItem;
12
12
13 class AreaChartItem : public Chart, public QGraphicsItem
13 class AreaChartItem : public ChartItem
14 {
14 {
15 Q_OBJECT
15 Q_OBJECT
16 public:
16 public:
Show file before | Show file after | Hide comments
@@ -76,8 +76,7 void QPieSeriesPrivate::updateDerivativeData()
76
76
77 void QPieSeriesPrivate::sliceChanged()
77 void QPieSeriesPrivate::sliceChanged()
78 {
78 {
79 QPieSlice* slice = qobject_cast<QPieSlice *>(sender());
79 Q_ASSERT(m_slices.contains(qobject_cast<QPieSlice *>(sender())));
80 Q_ASSERT(m_slices.contains(slice));
81 updateDerivativeData();
80 updateDerivativeData();
82 }
81 }
83
82
Show file before | Show file after | Hide comments
@@ -41,7 +41,7 void ScatterChartItem::createPoints(int count)
41 {
41 {
42 for (int i = 0; i < count; ++i) {
42 for (int i = 0; i < count; ++i) {
43
43
44 QGraphicsItem *item;
44 QGraphicsItem *item = 0;
45
45
46 switch (m_shape) {
46 switch (m_shape) {
47 case QScatterSeries::MarkerShapeCircle:{
47 case QScatterSeries::MarkerShapeCircle:{
General Comments 0
You need to be logged in to leave comments. Login now