HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r576:47e29632d9f9

Legend can handle removing of series

sauimone -

r576:47e29632d9f9

parent child

Context file:

r576:47e29632d9f9

Collapse all files

src/legendmarker.cpp +9 -7

                      setAcceptedMouseButtons(Qt::LeftButton|Qt::RightButton);
                  }
-             LegendMarker::LegendMarker(QBarSet* barset, QGraphicsItem *parent)
+             LegendMarker::LegendMarker(QSeries *series, QBarSet *barset, QGraphicsItem *parent)
                  : QGraphicsObject(parent)
                  ,mBoundingRect(0,0,1,1)
                  ,mName("")
-                 ,mSeries(0)
+                 ,mSeries(series)
                  ,mBarset(barset)
                  ,mPieslice(0)
                  ,mType(LegendMarkerTypeBarset)
                      setAcceptedMouseButtons(Qt::LeftButton|Qt::RightButton);
                  }
-             LegendMarker::LegendMarker(QPieSlice* pieslice, QGraphicsItem *parent)
+             LegendMarker::LegendMarker(QSeries *series, QPieSlice *pieslice, QGraphicsItem *parent)
                  : QGraphicsObject(parent)
                  ,mBoundingRect(0,0,1,1)
                  ,mName("")
-                 ,mSeries(0)
+                 ,mSeries(series)
                  ,mBarset(0)
                  ,mPieslice(pieslice)
                  ,mType(LegendMarkerTypePieslice)
                  return mName;
              }
+             QSeries* LegendMarker::series() const
+             {
+                 return mSeries;
+             }
              void LegendMarker::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
              {
                  painter->setBrush(mBrush);
                  switch (mType)
                  {
                  case LegendMarkerTypeSeries: {
-                     qDebug() << "LegendMarker::mousePressEvent LegendMarkerTypeSeries" << event;
                      emit clicked(mSeries,event->button());
                      break;
                      }
                  case LegendMarkerTypeBarset: {
-                     qDebug() << "LegendMarker::mousePressEvent LegendMarkerTypeBarset" << event;
                      emit clicked(mBarset,event->button());
                      break;
                      }
                  case LegendMarkerTypePieslice: {
-                     qDebug() << "LegendMarker::mousePressEvent LegendMarkerTypePieslice" << event;
                      emit clicked(mPieslice,event->button());
                      break;
                      }

src/legendmarker_p.h +4 -2

              public:
                  LegendMarker(QSeries* series, QGraphicsItem *parent = 0);
-                 LegendMarker(QBarSet* barset, QGraphicsItem *parent = 0);
-                 LegendMarker(QPieSlice* pieslice, QGraphicsItem *parent = 0);
+                 LegendMarker(QSeries* series, QBarSet* barset, QGraphicsItem *parent = 0);
+                 LegendMarker(QSeries* series, QPieSlice* pieslice, QGraphicsItem *parent = 0);
                  void setBoundingRect(const QRectF rect);
                  void setBrush(const QBrush brush);
                  void setName(const QString name);
                  QString name() const;
+                 QSeries* series() const;
                  void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
                  QRectF boundingRect() const;

src/qlegend.cpp +24 -5

                  case QSeries::SeriesTypeSpline: {
                      QSplineSeries* splineSeries = static_cast<QSplineSeries*>(series);
+                     createMarker(splineSeries);
                      break;
                  }
                  default: {
              void QLegend::handleSeriesRemoved(QSeries* series)
              {
-                 // TODO: delete markers, disconnect.
+                 if (series->type() == QSeries::SeriesTypeArea)
+                 {
+                     // This is special case. Area series has upper and lower series, which each have markers
+                     QAreaSeries* s = static_cast<QAreaSeries*> (series);
+                     deleteMarkers(s->upperSeries());
+                     deleteMarkers(s->lowerSeries());
+                 } else {
+                     deleteMarkers(series);
+                 }
                  mSeriesList.removeOne(series);
                  layoutChanged();
              }
                  layoutChanged();
              }
+             void QLegend::deleteMarkers(QSeries *series)
+             {
+                 // Search all markers that belong to given series and delete them.
+                 foreach (LegendMarker *m, mMarkers) {
+                     if (m->series() == series) {
+                         mMarkers.removeOne(m);
+                         delete m;
+                     }
+                 }
+             }
              void QLegend::createMarker(QXYSeries* series)
              {
                  LegendMarker* marker = new LegendMarker(series,this);
              void QLegend::createMarkers(QBarSeries *series)
              {
                  foreach(QBarSet* s, series->barSets()) {
-                     LegendMarker* marker = new LegendMarker(s,this);
+                     LegendMarker* marker = new LegendMarker(series,s,this);
                      marker->setName(s->name());
                      marker->setBrush(s->brush());
                      connect(marker,SIGNAL(clicked(QBarSet*,Qt::MouseButton)),this,SIGNAL(clicked(QBarSet*,Qt::MouseButton)));
              void QLegend::createMarkers(QPieSeries *series)
              {
                  foreach(QPieSlice* s, series->slices()) {
-                     LegendMarker* marker = new LegendMarker(s,this);
+                     LegendMarker* marker = new LegendMarker(series,s,this);
                      marker->setName(s->label());
                      marker->setBrush(s->sliceBrush());
                      connect(marker,SIGNAL(clicked(QPieSlice*,Qt::MouseButton)),this,SIGNAL(clicked(QPieSlice*,Qt::MouseButton)));
                  }
              }
              #include "moc_qlegend.cpp"
              QTCOMMERCIALCHART_END_NAMESPACE

src/qlegend.h +1 0

                  void createMarker(QXYSeries* series);
                  void createMarkers(QBarSeries* series);
                  void createMarkers(QPieSeries* series);
+                 void deleteMarkers(QSeries* series);
                  void layoutChanged();
                  // <--- PIMPL

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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