HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2209:71390eaf8334

no need for add/remove series in legend, since these are handled via slots

sauimone -

r2209:71390eaf8334

parent child

Context file:

r2209:71390eaf8334

Collapse all files

src/legend/qlegend.cpp +2 -27

                 return d_ptr->markers(series);
             }
-            void QLegend::addSeries(QAbstractSeries *series)
-                d_ptr->addSeries(series);
-            void QLegend::removeSeries(QAbstractSeries *series)
-                d_ptr->removeSeries(series);
             /*!
              \internal \a event see QGraphicsWidget for details
              */
                 return markers;
             }
-            void QLegendPrivate::addSeries(QAbstractSeries *series)
+            void QLegendPrivate::handleSeriesAdded(QAbstractSeries *series)
             {
-                // Only allow one instance of series
                 if (m_series.contains(series)) {
                     return;
                 }
                 m_layout->invalidate();
             }
-            void QLegendPrivate::removeSeries(QAbstractSeries *series)
+            void QLegendPrivate::handleSeriesRemoved(QAbstractSeries *series)
             {
                 if (m_series.contains(series)) {
                     m_series.removeOne(series);
                 m_layout->invalidate();
             }
-            void QLegendPrivate::handleSeriesAdded(QAbstractSeries *series)
-                // Moved to appendSeries
-                // This slot is just to make old code work for now.
-                addSeries(series);
-            void QLegendPrivate::handleSeriesRemoved(QAbstractSeries *series)
-                // Moved to removeSeries
-                // This slot is just to make old code work for now.
-                removeSeries(series);
             void QLegendPrivate::handleSeriesVisibleChanged()
             {
                 QAbstractSeries *series = qobject_cast<QAbstractSeries *> (sender());

src/legend/qlegend.h 0 -3

                 void setBackgroundVisible(bool visible = true);
                 bool isBackgroundVisible() const;
-                // New stuff:
                 QList <QLegendMarker*> markers(QAbstractSeries *series = 0) const;
-                void addSeries(QAbstractSeries *series);
-                void removeSeries(QAbstractSeries *series);
             protected:
                 void hideEvent(QHideEvent *event);

src/legend/qlegend_p.h 0 -2

                 QGraphicsItemGroup* items() { return m_items; }
                 QList<QLegendMarker*> markers(QAbstractSeries *series = 0);
-                void addSeries(QAbstractSeries *series);
-                void removeSeries(QAbstractSeries *series);
             public Q_SLOTS:
                 void handleSeriesAdded(QAbstractSeries *series);

tests/auto/qlegend/tst_qlegend.cpp +2 -2

                 pie->append(QString("slice2"), 2);
                 pie->append(QString("slice3"), 3);
-                legend->addSeries(pie);
+                m_chart->addSeries(pie);
                 QList<QLegendMarker *> markers = legend->markers();
                 QVERIFY(markers.count() == 3);
-                legend->removeSeries(pie);
+                m_chart->removeSeries(pie);
                 markers = legend->markers();
                 QVERIFY(markers.count() == 0);

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