HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r689:15b9cd07deb2

Release compilation fixes

Michal Klocek -

r689:15b9cd07deb2

parent child

Context file:

r689:15b9cd07deb2

src/areachart/areachartitem.cpp +7 -3

              //TODO: optimize : remove points which are not visible
-             AreaChartItem::AreaChartItem(QAreaSeries* areaSeries,ChartPresenter *presenter):Chart(presenter),QGraphicsItem(presenter->rootItem()),
+             AreaChartItem::AreaChartItem(QAreaSeries* areaSeries,ChartPresenter *presenter):ChartItem(presenter),
              m_series(areaSeries),
              m_upper(0),
              m_lower(0),
                  Q_UNUSED(option)
                  painter->save();
-                 painter->setPen(m_linePen);
-                 painter->setBrush(m_brush);
+                 QPen pen;
+                 pen.setCosmetic(false);
+                 pen.setWidth(4);
+                 pen.setColor(qRgb(200,0,250));
+                 painter->setPen(pen);
+                 //painter->setBrush(m_brush);
                  painter->setClipRect(m_clipRect);
                  painter->drawPath(m_path);
                  if(m_pointsVisible){

src/areachart/areachartitem_p.h +1 -1

              class QAreaSeries;
              class AreaChartItem;
-             class AreaChartItem : public Chart, public QGraphicsItem
+             class AreaChartItem : public ChartItem
              {
                  Q_OBJECT
              public:

src/piechart/qpieseries.cpp +1 -2

              void QPieSeriesPrivate::sliceChanged()
              {
-                 QPieSlice* slice = qobject_cast<QPieSlice *>(sender());
-                 Q_ASSERT(m_slices.contains(slice));
+                 Q_ASSERT(m_slices.contains(qobject_cast<QPieSlice *>(sender())));
                  updateDerivativeData();
              }

src/scatterseries/scatterchartitem.cpp +1 -1

              {
                  for (int i = 0; i < count; ++i) {
-                     QGraphicsItem *item;
+                     QGraphicsItem *item = 0;
                      switch (m_shape) {
                                 case QScatterSeries::MarkerShapeCircle:{

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