HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2177:3de587f7271d

Areaseries uses new legendmarkers

sauimone -

r2177:3de587f7271d

parent child

Context file:

r2177:3de587f7271d

Collapse all files

src/areachart/qareaseries.cpp +4 -5

             #include "charttheme_p.h"
             #include "qvalueaxis.h"
+            #include "qarealegendmarker.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
             QList<QLegendMarker*> QAreaSeriesPrivate::createLegendMarkers(QLegend* legend)
             {
-                Q_UNUSED(legend);
+                Q_Q(QAreaSeries);
-            //    Q_Q(QAreaSeries);
                 QList<QLegendMarker*> list;
-            // TODO:
+                return list << new QAreaLegendMarker(q,legend);
-            //    return list << new AreaLegendMarker(q,legend);
-                return list;
             }
             void QAreaSeriesPrivate::initializeAxis(QAbstractAxis *axis)

src/legend/qarealegendmarker.cpp +2 0

                 QLegendMarkerPrivate(q,legend),
                 m_series(series)
             {
+                qDebug() << "QAreaLegendMarkerPrivate created";
                 QObject::connect(m_series->d_func(),SIGNAL(updated()), this, SLOT(updated()));
                 QObject::connect(m_series, SIGNAL(nameChanged()), this, SLOT(updated()));
                 updated();
             void QAreaLegendMarkerPrivate::updated()
             {
+                qDebug() << "QAreaLegendMarkerPrivate::updated";
                 m_item->setBrush(m_series->brush());
                 m_item->setLabel(m_series->name());
             }

src/legend/qlegend.cpp +4 -5

                     QObject::connect(s, SIGNAL(countChanged()), this, SLOT(handleSeriesUpdated()));
                     break;
                 }
-                // TODO:
                 case QAbstractSeries::SeriesTypeLine:
                 case QAbstractSeries::SeriesTypeArea:
                 case QAbstractSeries::SeriesTypeScatter:
                 case QAbstractSeries::SeriesTypeSpline:
                 default: {
-                    // No need to connect any series related signals?
+                    // No need to connect any series related signals. We have no series level
-                    qDebug() << "Not yet implemented";
+                    // changes, that would generate or delete markers
                 }
                 }
                 case QAbstractSeries::SeriesTypeScatter:
                 case QAbstractSeries::SeriesTypeSpline:
                 default: {
-                    // No need to disconnect any series related signals?
+                    // No need to disconnect any series related signals
                     break;
                 }
                 }
             void QLegendPrivate::handleCountChanged()
             {
                 // TODO: With new markers, the series should notify markers directly.
-                // TODO: Better way to handle updates
+                // TODO: Better way to handle updates. Remove/Add series again seems like overkill.
                 QAbstractSeries *series = qobject_cast<QAbstractSeries *> (sender());
                 qDebug() << "QLegendPrivate::handleSeriesUpdated" << series;

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