HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2081:b2efc1272dac

legend private implemantation modified.

sauimone -

r2081:b2efc1272dac

parent child

Context file:

r2081:b2efc1272dac

Collapse all files

src/barchart/qabstractbarseries.cpp +13 -16

                     // Fail if set is already in list or set is null.
                     return false;
                 }
                 m_barSets.append(set);
                 QObject::connect(set->d_ptr.data(), SIGNAL(updatedLayout()), this, SIGNAL(updatedLayout()));
                 QObject::connect(set->d_ptr.data(), SIGNAL(updatedBars()), this, SIGNAL(updatedBars()));
                 QObject::connect(set->d_ptr.data(), SIGNAL(restructuredBars()), this, SIGNAL(restructuredBars()));
-                emit restructuredBars();      // this notifies barchartitem
-                if (m_dataset) {
+                emit restructuredBars();        // this notifies barchartitem
-                    m_dataset->updateSeries(q);   // this notifies legend
+                emit legendPropertiesUpdated(q); // this notifies legend
                 return true;
             }
                     // Fail if set is not in list
                     return false;
                 }
                 m_barSets.removeOne(set);
                 QObject::disconnect(set->d_ptr.data(), SIGNAL(updatedLayout()), this, SIGNAL(updatedLayout()));
                 QObject::disconnect(set->d_ptr.data(), SIGNAL(updatedBars()), this, SIGNAL(updatedBars()));
                 QObject::disconnect(set->d_ptr.data(), SIGNAL(restructuredBars()), this, SIGNAL(restructuredBars()));
                 emit restructuredBars();        // this notifies barchartitem
-                if (m_dataset) {
+                emit legendPropertiesUpdated(q);
-                    m_dataset->updateSeries(q);   // this notifies legend
                 return true;
             }
                     QObject::connect(set->d_ptr.data(), SIGNAL(updatedBars()), this, SIGNAL(updatedBars()));
                     QObject::connect(set->d_ptr.data(), SIGNAL(restructuredBars()), this, SIGNAL(restructuredBars()));
                 }
                 emit restructuredBars();        // this notifies barchartitem
-                if (m_dataset) {
+                emit legendPropertiesUpdated(q); // this notifies legend
-                    m_dataset->updateSeries(q);   // this notifies legend
                 return true;
             }
                 }
                 emit restructuredBars();        // this notifies barchartitem
-                if (m_dataset) {
+                emit legendPropertiesUpdated(q);
-                    m_dataset->updateSeries(q);   // this notifies legend
                 return true;
             }
                     // Fail if set is already in list or set is null.
                     return false;
                 }
                 m_barSets.insert(index, set);
                 QObject::connect(set->d_ptr.data(), SIGNAL(updatedLayout()), this, SIGNAL(updatedLayout()));
                 QObject::connect(set->d_ptr.data(), SIGNAL(updatedBars()), this, SIGNAL(updatedBars()));
                 QObject::connect(set->d_ptr.data(), SIGNAL(restructuredBars()), this, SIGNAL(restructuredBars()));
                 emit restructuredBars();      // this notifies barchartitem
-                if (m_dataset) {
+                emit legendPropertiesUpdated(q);
-                    m_dataset->updateSeries(q);   // this notifies legend
                 return true;
             }

src/chartdataset.cpp +2 -2

             {
                 return m_seriesDomainMap.keys();
             }
+            /*
             void ChartDataSet::updateSeries(QAbstractSeries *series)
             {
                 emit seriesUpdated(series);
             }
+            */
             #include "moc_chartdataset_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/chartdataset_p.h +2 -2

                 void addSeries(QAbstractSeries* series);
                 void removeSeries(QAbstractSeries* series);
                 void removeAllSeries();
-                void updateSeries(QAbstractSeries* series);
+            //    void updateSeries(QAbstractSeries* series);
                 void zoomInDomain(const QRectF& rect, const QSizeF& size);
                 void zoomOutDomain(const QRectF& rect, const QSizeF& size);
             Q_SIGNALS:
                 void seriesAdded(QAbstractSeries* series, Domain* domain);
                 void seriesRemoved(QAbstractSeries* series);
-                void seriesUpdated(QAbstractSeries* series);
+            //    void seriesUpdated(QAbstractSeries* series);
                 void axisAdded(QAbstractAxis* axis,Domain* domain);
                 void axisRemoved(QAbstractAxis* axis);

src/legend/qlegend.cpp +14 -32

                 setFlags(QGraphicsItem::ItemClipsChildrenToShape);
                 QObject::connect(chart->d_ptr->m_dataset,SIGNAL(seriesAdded(QAbstractSeries*,Domain*)),d_ptr.data(),SLOT(handleSeriesAdded(QAbstractSeries*,Domain*)));
                 QObject::connect(chart->d_ptr->m_dataset,SIGNAL(seriesRemoved(QAbstractSeries*)),d_ptr.data(),SLOT(handleSeriesRemoved(QAbstractSeries*)));
-                QObject::connect(chart->d_ptr->m_dataset,SIGNAL(seriesUpdated(QAbstractSeries*)),d_ptr.data(),SLOT(handleSeriesUpdated(QAbstractSeries*)));
+            //    QObject::connect(chart->d_ptr->m_dataset,SIGNAL(seriesUpdated(QAbstractSeries*)),d_ptr.data(),SLOT(handleSeriesUpdated(QAbstractSeries*)));
                 setLayout(d_ptr->m_layout);
             }
                 QList<LegendMarker*> markers = series->d_ptr->createLegendMarker(q_ptr);
-                foreach(LegendMarker* marker, markers) {
+                foreach (LegendMarker* marker, markers) {
                     marker->setFont(m_font);
                     marker->setLabelBrush(m_labelBrush);
                     marker->setVisible(series->isVisible());
                 }
                 QObject::connect(series, SIGNAL(visibleChanged()), this, SLOT(handleSeriesVisibleChanged()));
+                QObject::connect(series->d_ptr.data(), SIGNAL(legendPropertiesUpdated(QAbstractSeries*)), this, SLOT(handleLegendPropertiesUpdated(QAbstractSeries*)));
-                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()));
                 q_ptr->layout()->invalidate();
                 q_ptr->layout()->activate();
                     }
                 }
-                if(series->type() == QAbstractSeries::SeriesTypePie)
+                QObject::disconnect(series, SIGNAL(visibleChanged()), this, SLOT(handleSeriesVisibleChanged()));
+                QObject::disconnect(series->d_ptr.data(), SIGNAL(legendPropertiesUpdated(QAbstractSeries*)), this, SLOT(handleLegendPropertiesUpdated(QAbstractSeries*)));
-                    QPieSeries *pieSeries = static_cast<QPieSeries *>(series);
-                    QObject::disconnect(pieSeries, SIGNAL(added(QList<QPieSlice*>)), this, SLOT(handleUpdatePieSeries()));
-                    QObject::disconnect(pieSeries, SIGNAL(removed(QList<QPieSlice*>)), this, SLOT(handleUpdatePieSeries()));
                 q_ptr->layout()->invalidate();
             }
-            void QLegendPrivate::handleSeriesUpdated(QAbstractSeries *series)
-                // TODO: find out which markers are are added or removed. Update them
-                // TODO: better implementation
-                handleSeriesRemoved(series);
-                Domain domain;
-                handleSeriesAdded(series, &domain);
-            void QLegendPrivate::handleUpdatePieSeries()
-                //TODO: reimplement to be optimal
-                QPieSeries* series = qobject_cast<QPieSeries *> (sender());
-                Q_ASSERT(series);
-                handleSeriesRemoved(series);
-                handleSeriesAdded(series, 0);
             void QLegendPrivate::handleSeriesVisibleChanged()
             {
                 QAbstractSeries* series = qobject_cast<QAbstractSeries *> (sender());
                 q_ptr->layout()->invalidate();
             }
+            void QLegendPrivate::handleLegendPropertiesUpdated(QAbstractSeries *series)
+            {
+                // Handle new or removed markers
+                // Handle changes of marker pen/brush/label. every property that legend is interested
+                handleSeriesRemoved(series);
+                Domain domain;
+                handleSeriesAdded(series, &domain);
+            }
             #include "moc_qlegend.cpp"
             #include "moc_qlegend_p.cpp"

src/legend/qlegend_p.h +1 -2

             public Q_SLOTS:
                 void handleSeriesAdded(QAbstractSeries *series, Domain *domain);
                 void handleSeriesRemoved(QAbstractSeries *series);
-                void handleSeriesUpdated(QAbstractSeries *series);
-                void handleUpdatePieSeries(); //TODO remove this function
                 void handleSeriesVisibleChanged();
+                void handleLegendPropertiesUpdated(QAbstractSeries *series);
             private:
                 QLegend *q_ptr;

src/piechart/qpieseries.cpp +21 0

                     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 +1 0

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

src/qabstractseries_p.h +3 0

                 virtual void initializeAxis(QAbstractAxis* axis) = 0;
                 virtual QAbstractAxis::AxisType defaultAxisType(Qt::Orientation) const = 0;
+            Q_SIGNALS:
+                void legendPropertiesUpdated(QAbstractSeries* series);
             protected:
                 QAbstractSeries *q_ptr;
                 QChart *m_chart;

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