HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2179:8d0f04b94da2

examples/newlegend/mainwidget.cpp +9 -12

             #include <QPieSeries>
             #include <QPieSlice>
             #include <QLegendMarker>
+            #include <QPieLegendMarker>
             QTCOMMERCIALCHART_USE_NAMESPACE
             {
                 qDebug() << "marker count:" << m_chart->legend()->markers().count();
                 foreach (QLegendMarker* marker, m_chart->legend()->markers()) {
-                    qDebug() << "marker series type:" << marker->series()->type();
+                    qDebug() << "marker type:" << marker->type();
-                    qDebug() << "peer object:" << marker->peerObject();
+                    qDebug() << "related series:" << marker->series();
-                    qDebug() << "label:" << marker->label();
                 }
             }
             void MainWidget::handleMarkerClicked()
             {
                 QLegendMarker* marker = qobject_cast<QLegendMarker*> (sender());
+                Q_ASSERT(marker);
-                qDebug() << "marker clicked:" << marker;
+                switch (marker->type())
-                switch (marker->series()->type())
                 {
-                    case QAbstractSeries::SeriesTypePie:
+                    case QLegendMarker::LegendMarkerTypePie:
                     {
-                        // Series type is pie.
+                        QPieLegendMarker *pieMarker = qobject_cast<QPieLegendMarker *> (marker);
-                        // The peer object is QPieSlice
+                        QPieSlice* slice = pieMarker->slice();
-                        QPieSlice* slice = qobject_cast<QPieSlice*> (marker->peerObject());
-                        Q_ASSERT(slice);
                         slice->setExploded(!slice->isExploded());
                         break;
                     }
                     default:
                     {
-                        qDebug() << "Unknown series type";
+                        qDebug() << "Unknown marker type";
                         break;
                     }
                 }

src/legend/qarealegendmarker.cpp 0 -6

                 return d->m_series;
             }
-            QAreaSeries* QAreaLegendMarker::peerObject()
-                Q_D(QAreaLegendMarker);
-                return d->m_series;
             ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QAreaLegendMarkerPrivate::QAreaLegendMarkerPrivate(QAreaLegendMarker *q, QAreaSeries *series, QLegend *legend) :

src/legend/qarealegendmarker.h +4 -6

                 explicit QAreaLegendMarker(QAreaSeries* series, QLegend *legend, QObject *parent = 0);
                 virtual ~QAreaLegendMarker();
-                virtual QAreaSeries* series();
+                virtual LegendMarkerType type() { return LegendMarkerTypeArea; }
-                virtual QAreaSeries* peerObject();    // TODO: rename to slice and remove these virtuals from base class?
+                // Related series
+                QAreaSeries* series();
             protected:
                 QAreaLegendMarker(QAreaLegendMarkerPrivate &d, QObject *parent = 0);
-            //Q_SIGNALS:
-            //public Q_SLOTS:
             private:
                 Q_DECLARE_PRIVATE(QAreaLegendMarker)
                 Q_DISABLE_COPY(QAreaLegendMarker)

src/legend/qbarlegendmarker.cpp +1 -1

                 return d->m_series;
             }
-            QBarSet* QBarLegendMarker::peerObject()
+            QBarSet* QBarLegendMarker::barset()
             {
                 Q_D(QBarLegendMarker);
                 return d->m_barset;

src/legend/qbarlegendmarker.h +5 -6

                 explicit QBarLegendMarker(QAbstractBarSeries* series, QBarSet* barset, QLegend *legend, QObject *parent = 0);
                 virtual ~QBarLegendMarker();
-                virtual QAbstractBarSeries* series();
+                virtual LegendMarkerType type() { return LegendMarkerTypeBar; }
-                virtual QBarSet* peerObject();    // TODO: rename to slice and remove these virtuals from base class?
+                // Related series and barset
+                QAbstractBarSeries* series();
+                QBarSet* barset();
             protected:
                 QBarLegendMarker(QBarLegendMarkerPrivate &d, QObject *parent = 0);
-            //Q_SIGNALS:
-            //public Q_SLOTS:
             private:
                 Q_DECLARE_PRIVATE(QBarLegendMarker)
                 Q_DISABLE_COPY(QBarLegendMarker)

src/legend/qlegendmarker.h +9 -7

             class QAbstractSeries;
             class QLegend;
-            // TODO: should this be QAbstractLegendMarker?
             class QTCOMMERCIALCHART_EXPORT QLegendMarker : public QObject
             {
                 Q_OBJECT
-            // TODO: need for these?
+                enum LegendMarkerType {
+                    LegendMarkerTypeArea,
+                    LegendMarkerTypeBar,
+                    LegendMarkerTypePie,
+                    LegendMarkerTypeXY
+                };
+            // TODO:
             //    Q_PROPERTY(QString label READ label WRITE setlabel NOTIFY labelChanged);
             //    Q_PROPERTY(QPen pen READ pen WRITE setPen NOTIFY penChanged);
             //    Q_PROPERTY(QBrush brush READ brush WRITE setBrush NOTIFY brushChanged);
             public:
-            //    explicit QLegendMarker(QAbstractSeries* series, QObject *parent = 0);
                 virtual ~QLegendMarker();
+                virtual LegendMarkerType type() = 0;
                 QString label() const;
                 void setLabel(const QString &label);
                 bool isVisible() const;
                 void setVisible(bool visible);
-            //    virtual QAbstractSeries::SeriesType type() = 0; // TODO? Or use LegendMarker type enum?
-                virtual QAbstractSeries* series() = 0;      // TODO: remove these and use specialised functions on derived classes?
-                virtual QObject* peerObject() = 0;
             protected:
                 explicit QLegendMarker(QLegendMarkerPrivate &d, QObject *parent = 0);

src/legend/qpielegendmarker.cpp +1 -1

                 return d->m_series;
             }
-            QPieSlice* QPieLegendMarker::peerObject()
+            QPieSlice* QPieLegendMarker::slice()
             {
                 Q_D(QPieLegendMarker);
                 return d->m_slice;

src/legend/qpielegendmarker.h +5 -6

                 explicit QPieLegendMarker(QPieSeries* series, QPieSlice* slice, QLegend *legend, QObject *parent = 0);
                 virtual ~QPieLegendMarker();
-                virtual QPieSeries* series();
+                virtual LegendMarkerType type() { return LegendMarkerTypePie; }
-                virtual QPieSlice* peerObject();    // TODO: rename to slice and remove these virtuals from base class?
+                // Related series and slice
+                QPieSeries* series();
+                QPieSlice* slice();
             protected:
                 QPieLegendMarker(QPieLegendMarkerPrivate &d, QObject *parent = 0);
-            //Q_SIGNALS:
-            //public Q_SLOTS:
             private:
                 Q_DECLARE_PRIVATE(QPieLegendMarker)
                 Q_DISABLE_COPY(QPieLegendMarker)

src/legend/qxylegendmarker.cpp 0 -6

                 return d->m_series;
             }
-            QXYSeries* QXYLegendMarker::peerObject()
-                Q_D(QXYLegendMarker);
-                return d->m_series;
             ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QXYLegendMarkerPrivate::QXYLegendMarkerPrivate(QXYLegendMarker *q, QXYSeries *series, QLegend *legend) :

src/legend/qxylegendmarker.h +4 -6

                 explicit QXYLegendMarker(QXYSeries* series, QLegend *legend, QObject *parent = 0);
                 virtual ~QXYLegendMarker();
-                virtual QXYSeries* series();
+                virtual LegendMarkerType type() { return LegendMarkerTypeXY; }
-                virtual QXYSeries* peerObject();    // TODO: rename to slice and remove these virtuals from base class?
+                // Related series
+                QXYSeries* series();
             protected:
                 QXYLegendMarker(QXYLegendMarkerPrivate &d, QObject *parent = 0);
-            //Q_SIGNALS:
-            //public Q_SLOTS:
             private:
                 Q_DECLARE_PRIVATE(QXYLegendMarker)
                 Q_DISABLE_COPY(QXYLegendMarker)

	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