HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1328:a05051bade54

Fixed a bug with legend not updating series labels

Tero Ahola -

r1328:a05051bade54

parent child

Context file:

r1328:a05051bade54

src/legend/legendmarker.cpp +4 -1

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            LegendMarker::LegendMarker(QAbstractSeries *series, QLegend *legend) : QGraphicsObject(legend),
+            LegendMarker::LegendMarker(QAbstractSeries *series, QLegend *legend) :
+                QGraphicsObject(legend),
                 m_series(series),
                 m_markerRect(0,0,10.0,10.0),
                 m_boundingRect(0,0,0,0),
             {
                 //QObject::connect(this, SIGNAL(selected()), series, SIGNAL(selected()));
                 QObject::connect(series->d_func(),SIGNAL(updated()), this, SLOT(updated()));
+                QObject::connect(series, SIGNAL(nameChanged()), this, SLOT(updated()));
                 updated();
             }
             {
                 //QObject::connect(this, SIGNAL(selected()), series, SIGNAL(selected()));
                 QObject::connect(series->d_func(),SIGNAL(updated()), this, SLOT(updated()));
+                QObject::connect(series, SIGNAL(nameChanged()), this, SLOT(updated()));
                 updated();
             }

src/legend/qlegend.cpp +1 -3

                 foreach(LegendMarker* marker, markers)
                     m_markers->addToGroup(marker);
-                if(series->type() == QAbstractSeries::SeriesTypePie)
+                if(series->type() == QAbstractSeries::SeriesTypePie) {
                     QPieSeries *pieSeries = static_cast<QPieSeries *>(series);
                     QObject::connect(pieSeries, SIGNAL(added(QList<QPieSlice*>)), this, SLOT(handleUpdatePieSeries()));
                     QObject::connect(pieSeries, SIGNAL(removed(QList<QPieSlice*>)), this, SLOT(handleUpdatePieSeries()));
             void QLegendPrivate::handleSeriesRemoved(QAbstractSeries *series)
             {
                 QList<QGraphicsItem *> items = m_markers->childItems();
                 foreach (QGraphicsItem *markers, items) {

src/qabstractseries.cpp +3 0

             void QAbstractSeries::setName(const QString& name)
             {
+                if (name != d_ptr->m_name) {
                     d_ptr->m_name = name;
+                    nameChanged();
+                }
             }
             /*!

src/qabstractseries.h +4 -1

             class QTCOMMERCIALCHART_EXPORT QAbstractSeries : public QObject
             {
                 Q_OBJECT
-                Q_PROPERTY(QString name READ name WRITE setName)
+                Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
                 Q_ENUMS(SeriesType)
             public:
                 QString name() const;
                 QChart* chart() const;
+            Q_SIGNALS:
+                void nameChanged();
             protected:
                 QScopedPointer<QAbstractSeriesPrivate> d_ptr;
                 friend class ChartDataSet;

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