HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2085:224fca6f4967

Fixes legend markers updates

Michal Klocek -

r2085:224fca6f4967

parent child

Context file:

r2085:224fca6f4967

Collapse all files

src/barchart/qabstractbarseries.cpp +4 -12

             /*!
                 \internal
             */
-            QAbstractBarSeries::QAbstractBarSeries(QAbstractBarSeriesPrivate &d, QObject *parent) :
+            QAbstractBarSeries::QAbstractBarSeries(QAbstractBarSeriesPrivate &o, QObject *parent) :
-                QAbstractSeries(d,parent)
+                QAbstractSeries(o,parent)
             {
+                Q_D(QAbstractSeries);
+                QObject::connect(this,SIGNAL(countChanged()),d,SIGNAL(countChanged()));
             }
             /*!
             bool QAbstractBarSeriesPrivate::append(QBarSet *set)
             {
-                Q_Q(QAbstractBarSeries);
                 if ((m_barSets.contains(set)) || (set == 0)) {
                     // Fail if set is already in list or set is null.
                     return false;
                 QObject::connect(set->d_ptr.data(), SIGNAL(restructuredBars()), this, SIGNAL(restructuredBars()));
                 emit restructuredBars();        // this notifies barchartitem
-                emit legendPropertiesUpdated(q); // this notifies legend
                 return true;
             }
             bool QAbstractBarSeriesPrivate::remove(QBarSet *set)
             {
-                Q_Q(QAbstractBarSeries);
                 if (!m_barSets.contains(set)) {
                     // Fail if set is not in list
                     return false;
                 QObject::disconnect(set->d_ptr.data(), SIGNAL(restructuredBars()), this, SIGNAL(restructuredBars()));
                 emit restructuredBars();        // this notifies barchartitem
-                emit legendPropertiesUpdated(q);
                 return true;
             }
             bool QAbstractBarSeriesPrivate::append(QList<QBarSet* > sets)
             {
-                Q_Q(QAbstractBarSeries);
                 foreach (QBarSet* set, sets) {
                     if ((set == 0) || (m_barSets.contains(set))) {
                         // Fail if any of the sets is null or is already appended.
                 }
                 emit restructuredBars();        // this notifies barchartitem
-                emit legendPropertiesUpdated(q); // this notifies legend
                 return true;
             }
             bool QAbstractBarSeriesPrivate::remove(QList<QBarSet* > sets)
             {
-                Q_Q(QAbstractBarSeries);
                 if (sets.count() == 0) {
                     return false;
                 }
                 }
                 emit restructuredBars();        // this notifies barchartitem
-                emit legendPropertiesUpdated(q);
                 return true;
             }
             bool QAbstractBarSeriesPrivate::insert(int index, QBarSet *set)
             {
-                Q_Q(QAbstractBarSeries);
                 if ((m_barSets.contains(set)) || (set == 0)) {
                     // Fail if set is already in list or set is null.
                     return false;
                 QObject::connect(set->d_ptr.data(), SIGNAL(restructuredBars()), this, SIGNAL(restructuredBars()));
                 emit restructuredBars();      // this notifies barchartitem
-                emit legendPropertiesUpdated(q);
                 return true;
             }

src/barchart/vertical/bar/qbarseries.cpp +1 0

             QBarSeries::QBarSeries(QObject *parent)
                 : QAbstractBarSeries(*new QBarSeriesPrivate(this), parent)
             {
             }
             /*!

src/legend/legendlayout.cpp 0 -1

             void LegendLayout::setAttachedGeometry(const QRectF& rect)
             {
                 if (!rect.isValid()) return;
                 m_offsetX=0;
                 m_offsetY=0;

src/legend/legendmarker.cpp +2 -1

             #include <QPainter>
             #include <QGraphicsSceneEvent>
             #include <QGraphicsSimpleTextItem>
-            #include <QDebug>
+            #include <QGraphicsLayout>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             {
                 m_text = label;
                 updateGeometry();
+                m_legend->layout()->invalidate();
             }
             QString LegendMarker::label() const

src/legend/qlegend.cpp +10 -9

                 }
                 QObject::connect(series, SIGNAL(visibleChanged()), this, SLOT(handleSeriesVisibleChanged()));
-                QObject::connect(series->d_ptr.data(), SIGNAL(legendPropertiesUpdated(QAbstractSeries*)), this, SLOT(handleLegendPropertiesUpdated(QAbstractSeries*)));
+                QObject::connect(series->d_ptr.data(), SIGNAL(countChanged()), this, SLOT(handleCountChanged()));
+                m_items->setVisible(false);
                 q_ptr->layout()->invalidate();
-                q_ptr->layout()->activate();
+                m_presenter->layout()->invalidate();
             }
             void QLegendPrivate::handleSeriesRemoved(QAbstractSeries *series)
                 }
                 QObject::disconnect(series, SIGNAL(visibleChanged()), this, SLOT(handleSeriesVisibleChanged()));
-                QObject::disconnect(series->d_ptr.data(), SIGNAL(legendPropertiesUpdated(QAbstractSeries*)), this, SLOT(handleLegendPropertiesUpdated(QAbstractSeries*)));
+                QObject::disconnect(series->d_ptr.data(), SIGNAL(countChanged()), this, SLOT(handleCountChanged()));
                 q_ptr->layout()->invalidate();
             }
             void QLegendPrivate::handleSeriesVisibleChanged()
             {
                 QAbstractSeries* series = qobject_cast<QAbstractSeries *> (sender());
+                Q_ASSERT(series);
                 foreach (LegendMarker* marker, m_markers) {
                     if (marker->series() == series) {
                 q_ptr->layout()->invalidate();
             }
-            void QLegendPrivate::handleLegendPropertiesUpdated(QAbstractSeries *series)
+            void QLegendPrivate::handleCountChanged()
             {
-                // Handle new or removed markers
+                QAbstractSeriesPrivate* series = qobject_cast<QAbstractSeriesPrivate *> (sender());
-                // Handle changes of marker pen/brush/label. every property that legend is interested
+                Q_ASSERT(series);
-                handleSeriesRemoved(series);
+                handleSeriesRemoved(series->q_ptr);
-                Domain domain;
+                handleSeriesAdded(series->q_ptr, 0);
-                handleSeriesAdded(series, &domain);
             }
             #include "moc_qlegend.cpp"

src/legend/qlegend_p.h +1 -1

                 void handleSeriesAdded(QAbstractSeries *series, Domain *domain);
                 void handleSeriesRemoved(QAbstractSeries *series);
                 void handleSeriesVisibleChanged();
-                void handleLegendPropertiesUpdated(QAbstractSeries *series);
+                void handleCountChanged();
             private:
                 QLegend *q_ptr;

src/piechart/qpieseries.cpp +2 -21

             QPieSeries::QPieSeries(QObject *parent) :
                 QAbstractSeries(*new QPieSeriesPrivate(this),parent)
             {
+                Q_D(QPieSeries);
+                QObject::connect(this,SIGNAL(countChanged()),d,SIGNAL(countChanged()));
             }
             /*!
                     connect(s, SIGNAL(valueChanged()), d, SLOT(sliceValueChanged()));
                     connect(s, SIGNAL(clicked()), d, SLOT(sliceClicked()));
                     connect(s, SIGNAL(hovered(bool)), d, SLOT(sliceHovered(bool)));
-                    connect(s, SIGNAL(labelChanged()), d, SLOT(updateLegendProperties()));
-                    connect(s, SIGNAL(penChanged()), d, SLOT(updateLegendProperties()));
-                    connect(s, SIGNAL(brushChanged()), d, SLOT(updateLegendProperties()));
-                    connect(s, SIGNAL(labelBrushChanged()), d, SLOT(updateLegendProperties()));
-                    connect(s, SIGNAL(labelFontChanged()), d, SLOT(updateLegendProperties()));
-                    connect(s, SIGNAL(labelFontChanged()), d, SLOT(updateLegendProperties()));
                 }
                 emit added(slices);
                 connect(slice, SIGNAL(clicked()), d, SLOT(sliceClicked()));
                 connect(slice, SIGNAL(hovered(bool)), d, SLOT(sliceHovered(bool)));
-                connect(slice, SIGNAL(labelChanged()), d, SLOT(updateLegendProperties()));
-                connect(slice, SIGNAL(penChanged()), d, SLOT(updateLegendProperties()));
-                connect(slice, SIGNAL(brushChanged()), d, SLOT(updateLegendProperties()));
-                connect(slice, SIGNAL(labelBrushChanged()), d, SLOT(updateLegendProperties()));
-                connect(slice, SIGNAL(labelFontChanged()), d, SLOT(updateLegendProperties()));
-                connect(slice, SIGNAL(labelFontChanged()), d, SLOT(updateLegendProperties()));
                 emit added(QList<QPieSlice*>() << slice);
                 emit countChanged();
                 emit q->hovered(slice, state);
             }
-            void QPieSeriesPrivate::updateLegendProperties()
-                // This slot listens to all properties of slices, which may interest legend and signals it.
-                Q_Q(QPieSeries);
-                emit legendPropertiesUpdated(q);
             void QPieSeriesPrivate::scaleDomain(Domain& domain)
             {
                 Q_UNUSED(domain);

src/piechart/qpieseries_p.h 0 -1

                 void sliceValueChanged();
                 void sliceClicked();
                 void sliceHovered(bool state);
-                void updateLegendProperties();
             private:
                 QList<QPieSlice*> m_slices;

src/qabstractseries_p.h +2 -1

                 virtual QAbstractAxis::AxisType defaultAxisType(Qt::Orientation) const = 0;
             Q_SIGNALS:
-                void legendPropertiesUpdated(QAbstractSeries* series);
+                void countChanged();
             protected:
                 QAbstractSeries *q_ptr;
                 friend class QAbstractSeries;
                 friend class ChartDataSet;
+                friend class QLegendPrivate;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

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