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

removed peer object solution. Introduced marker type solution

sauimone -

r2179:8d0f04b94da2

parent child

Context file:

r2179:8d0f04b94da2

Collapse all files

examples/newlegend/mainwidget.cpp +9 -12

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "mainwidget.h"
             #include <QChart>
             #include <QChartView>
             #include <QPushButton>
             #include <QLabel>
             #include <QDebug>
             #include <QLegend>
             #include <QFormLayout>
             #include <QPieSeries>
             #include <QPieSlice>
             #include <QLegendMarker>
+            #include <QPieLegendMarker>
             QTCOMMERCIALCHART_USE_NAMESPACE
             MainWidget::MainWidget(QWidget *parent) :
                 QWidget(parent)
             {
                 // Create buttons for ui
                 m_buttonLayout = new QGridLayout();
                 QPushButton *detachLegendButton = new QPushButton("Toggle attached");
                 connect(detachLegendButton, SIGNAL(clicked()), this, SLOT(toggleAttached()));
                 m_buttonLayout->addWidget(detachLegendButton, 0, 0);
                 QPushButton *addSliceButton = new QPushButton("add slice");
                 connect(addSliceButton, SIGNAL(clicked()), this, SLOT(addSlice()));
                 m_buttonLayout->addWidget(addSliceButton, 2, 0);
                 QPushButton *removeSliceButton = new QPushButton("remove slice");
                 connect(removeSliceButton, SIGNAL(clicked()), this, SLOT(removeSlice()));
                 m_buttonLayout->addWidget(removeSliceButton, 3, 0);
                 QPushButton *alignButton = new QPushButton("Align (Bottom)");
                 connect(alignButton, SIGNAL(clicked()), this, SLOT(setLegendAlignment()));
                 m_buttonLayout->addWidget(alignButton, 4, 0);
                 QPushButton *boldButton = new QPushButton("Toggle bold");
                 connect(boldButton, SIGNAL(clicked()), this, SLOT(toggleBold()));
                 m_buttonLayout->addWidget(boldButton, 5, 0);
                 QPushButton *italicButton = new QPushButton("Toggle italic");
                 connect(italicButton, SIGNAL(clicked()), this, SLOT(toggleItalic()));
                 m_buttonLayout->addWidget(italicButton, 6, 0);
                 QPushButton *infoButton = new QPushButton("Debug info");
                 connect(infoButton, SIGNAL(clicked()), this, SLOT(showDebugInfo()));
                 m_buttonLayout->addWidget(infoButton, 7, 0);
                 QPushButton *connectButton = new QPushButton("Connect markers");
                 connect(connectButton, SIGNAL(clicked()), this, SLOT(connectMarkers()));
                 m_buttonLayout->addWidget(connectButton, 8, 0);
                 QPushButton *disConnectButton = new QPushButton("Disconnect markers");
                 connect(disConnectButton, SIGNAL(clicked()), this, SLOT(disconnectMarkers()));
                 m_buttonLayout->addWidget(disConnectButton, 9, 0);
                 m_legendPosX = new QDoubleSpinBox();
                 m_legendPosY = new QDoubleSpinBox();
                 m_legendWidth = new QDoubleSpinBox();
                 m_legendHeight = new QDoubleSpinBox();
                 connect(m_legendPosX, SIGNAL(valueChanged(double)), this, SLOT(updateLegendLayout()));
                 connect(m_legendPosY, SIGNAL(valueChanged(double)), this, SLOT(updateLegendLayout()));
                 connect(m_legendWidth, SIGNAL(valueChanged(double)), this, SLOT(updateLegendLayout()));
                 connect(m_legendHeight, SIGNAL(valueChanged(double)), this, SLOT(updateLegendLayout()));
                 QFormLayout* legendLayout = new QFormLayout();
                 legendLayout->addRow("HPos", m_legendPosX);
                 legendLayout->addRow("VPos", m_legendPosY);
                 legendLayout->addRow("Width", m_legendWidth);
                 legendLayout->addRow("Height", m_legendHeight);
                 m_legendSettings = new QGroupBox("Detached legend");
                 m_legendSettings->setLayout(legendLayout);
                 m_buttonLayout->addWidget(m_legendSettings);
                 m_legendSettings->setVisible(false);
                 // Create chart view with the chart
                 m_chart = new QChart();
                 m_chartView = new QChartView(m_chart, this);
                 // Create spinbox to modify font size
                 m_fontSize = new QDoubleSpinBox();
                 m_fontSize->setValue(m_chart->legend()->font().pointSizeF());
                 connect(m_fontSize, SIGNAL(valueChanged(double)), this, SLOT(fontSizeChanged()));
                 QFormLayout* fontLayout = new QFormLayout();
                 fontLayout->addRow("Legend font size", m_fontSize);
                 // Create layout for grid and detached legend
                 m_mainLayout = new QGridLayout();
                 m_mainLayout->addLayout(m_buttonLayout, 0, 0);
                 m_mainLayout->addLayout(fontLayout,1,0);
                 m_mainLayout->addWidget(m_chartView, 0, 1, 3, 1);
                 setLayout(m_mainLayout);
                 createSeries();
             }
             void MainWidget::createSeries()
             {
                 m_series = new QPieSeries();
                 addSlice();
                 addSlice();
                 addSlice();
                 addSlice();
                 m_chart->addSeries(m_series);
                 m_chart->setTitle("Legend detach example");
                 m_chart->createDefaultAxes();
             //![1]
                 m_chart->legend()->setVisible(true);
                 m_chart->legend()->setAlignment(Qt::AlignBottom);
             //![1]
                 m_chartView->setRenderHint(QPainter::Antialiasing);
             }
             void MainWidget::showLegendSpinbox()
             {
                 m_legendSettings->setVisible(true);
                 QRectF chartViewRect = m_chartView->rect();
                 m_legendPosX->setMinimum(0);
                 m_legendPosX->setMaximum(chartViewRect.width());
                 m_legendPosX->setValue(150);
                 m_legendPosY->setMinimum(0);
                 m_legendPosY->setMaximum(chartViewRect.height());
                 m_legendPosY->setValue(150);
                 m_legendWidth->setMinimum(0);
                 m_legendWidth->setMaximum(chartViewRect.width());
                 m_legendWidth->setValue(150);
                 m_legendHeight->setMinimum(0);
                 m_legendHeight->setMaximum(chartViewRect.height());
                 m_legendHeight->setValue(75);
             }
             void MainWidget::hideLegendSpinbox()
             {
                 m_legendSettings->setVisible(false);
             }
             void MainWidget::toggleAttached()
             {
                 QLegend *legend = m_chart->legend();
                 if (legend->isAttachedToChart()) {
                     //![2]
                     legend->detachFromChart();
                     m_chart->legend()->setBackgroundVisible(true);
                     m_chart->legend()->setBrush(QBrush(QColor(128,128,128,128)));
                     m_chart->legend()->setPen(QPen(QColor(192,192,192,192)));
                     //![2]
                     showLegendSpinbox();
                     updateLegendLayout();
                 } else {
                     //![3]
                     legend->attachToChart();
                     legend->setBackgroundVisible(false);
                     //![3]
                     hideLegendSpinbox();
                 }
                 update();
             }
             void MainWidget::addSlice()
             {
                 QPieSlice* slice = new QPieSlice(QString("slice " + QString::number(m_series->count())), m_series->count()+1);
                 m_series->append(slice);
             }
             void MainWidget::removeSlice()
             {
                 QList<QPieSlice*> slices = m_series->slices();
                 if (slices.count() > 0) {
                     m_series->remove(slices.at(slices.count()-1));
                 }
             }
             void MainWidget::connectMarkers()
             {
                 // Example use case.
                 // Explode slice via marker.
                 // Should be doable via public api.
                 foreach (QLegendMarker* marker, m_chart->legend()->markers()) {
                     // Disconnect possible existing connection to avoid multiple connections
                     QObject::disconnect(marker, SIGNAL(clicked()), this, SLOT(handleMarkerClicked()));
                     QObject::connect(marker, SIGNAL(clicked()), this, SLOT(handleMarkerClicked()));
                 }
             }
             void MainWidget::disconnectMarkers()
             {
                 foreach (QLegendMarker* marker, m_chart->legend()->markers()) {
                     QObject::disconnect(marker, SIGNAL(clicked()), this, SLOT(handleMarkerClicked()));
                 }
             }
             void MainWidget::setLegendAlignment()
             {
                 QPushButton *button = qobject_cast<QPushButton *>(sender());
                 switch (m_chart->legend()->alignment()) {
                 case Qt::AlignTop:
                     m_chart->legend()->setAlignment(Qt::AlignLeft);
                     if (button)
                         button->setText("Align (Left)");
                     break;
                 case Qt::AlignLeft:
                     m_chart->legend()->setAlignment(Qt::AlignBottom);
                     if (button)
                         button->setText("Align (Bottom)");
                     break;
                 case Qt::AlignBottom:
                     m_chart->legend()->setAlignment(Qt::AlignRight);
                     if (button)
                         button->setText("Align (Right)");
                     break;
                 default:
                     if (button)
                         button->setText("Align (Top)");
                     m_chart->legend()->setAlignment(Qt::AlignTop);
                     break;
                 }
             }
             void MainWidget::toggleBold()
             {
                 QFont font = m_chart->legend()->font();
                 font.setBold(!font.bold());
                 m_chart->legend()->setFont(font);
             }
             void MainWidget::toggleItalic()
             {
                 QFont font = m_chart->legend()->font();
                 font.setItalic(!font.italic());
                 m_chart->legend()->setFont(font);
             }
             void MainWidget::showDebugInfo()
             {
                 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::fontSizeChanged()
             {
                 QFont font = m_chart->legend()->font();
                 font.setPointSizeF(m_fontSize->value());
                 m_chart->legend()->setFont(font);
             }
             void MainWidget::updateLegendLayout()
             {
             //![4]
                 m_chart->legend()->setGeometry(QRectF(m_legendPosX->value()
                                                ,m_legendPosY->value()
                                                ,m_legendWidth->value()
                                                ,m_legendHeight->value()));
                 m_chart->legend()->update();
             //![4]
             }
             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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "qarealegendmarker.h"
             #include "qarealegendmarker_p.h"
             #include "qareaseries_p.h"
             #include <QAreaSeries>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             QAreaLegendMarker::QAreaLegendMarker(QAreaSeries* series, QLegend *legend, QObject *parent) :
                 QLegendMarker(*new QAreaLegendMarkerPrivate(this,series,legend), parent)
             {
             }
             QAreaLegendMarker::~QAreaLegendMarker()
             {
             //    qDebug() << "deleting Area marker" << this;
             }
             /*!
                 \internal
             */
             QAreaLegendMarker::QAreaLegendMarker(QAreaLegendMarkerPrivate &d, QObject *parent) :
                 QLegendMarker(d, parent)
             {
             }
             QAreaSeries* QAreaLegendMarker::series()
             {
                 Q_D(QAreaLegendMarker);
                 return d->m_series;
             }
-            QAreaSeries* QAreaLegendMarker::peerObject()
-                Q_D(QAreaLegendMarker);
-                return d->m_series;
             ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QAreaLegendMarkerPrivate::QAreaLegendMarkerPrivate(QAreaLegendMarker *q, QAreaSeries *series, QLegend *legend) :
                 QLegendMarkerPrivate(q,legend),
                 m_series(series)
             {
                 QObject::connect(m_series->d_func(),SIGNAL(updated()), this, SLOT(updated()));
                 QObject::connect(m_series, SIGNAL(nameChanged()), this, SLOT(updated()));
                 updated();
             }
             QAreaLegendMarkerPrivate::~QAreaLegendMarkerPrivate()
             {
                 QObject::disconnect(m_series->d_func(),SIGNAL(updated()), this, SLOT(updated()));
                 QObject::disconnect(m_series, SIGNAL(nameChanged()), this, SLOT(updated()));
             }
             void QAreaLegendMarkerPrivate::updated()
             {
                 m_item->setBrush(m_series->brush());
                 m_item->setLabel(m_series->name());
             }
             #include "moc_qarealegendmarker.cpp"
             #include "moc_qarealegendmarker_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/legend/qarealegendmarker.h +4 -6

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef QAREALEGENDMARKER_H
             #define QAREALEGENDMARKER_H
             #include <QChartGlobal>
             #include <QLegendMarker>
             #include <QAreaSeries>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QAreaLegendMarkerPrivate;
             // TODO: No export? make this private. QLegendMarker should be enough for user of the api (why expose the details?)
             class QTCOMMERCIALCHART_EXPORT QAreaLegendMarker : public QLegendMarker
             {
                 Q_OBJECT
             public:
                 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)
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QAREALEGENDMARKER_H

src/legend/qbarlegendmarker.cpp +1 -1

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "qbarlegendmarker.h"
             #include "qbarlegendmarker_p.h"
             #include <QAbstractBarSeries>
             #include <QBarSet>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             QBarLegendMarker::QBarLegendMarker(QAbstractBarSeries* series, QBarSet* barset, QLegend *legend, QObject *parent) :
                 QLegendMarker(*new QBarLegendMarkerPrivate(this,series,barset,legend), parent)
             {
             }
             QBarLegendMarker::~QBarLegendMarker()
             {
             //    qDebug() << "deleting bar marker" << this;
             }
             /*!
                 \internal
             */
             QBarLegendMarker::QBarLegendMarker(QBarLegendMarkerPrivate &d, QObject *parent) :
                 QLegendMarker(d, parent)
             {
             }
             QAbstractBarSeries *QBarLegendMarker::series()
             {
                 Q_D(QBarLegendMarker);
                 return d->m_series;
             }
-            QBarSet* QBarLegendMarker::peerObject()
+            QBarSet* QBarLegendMarker::barset()
             {
                 Q_D(QBarLegendMarker);
                 return d->m_barset;
             }
             ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QBarLegendMarkerPrivate::QBarLegendMarkerPrivate(QBarLegendMarker *q, QAbstractBarSeries *series, QBarSet *barset, QLegend *legend) :
                 QLegendMarkerPrivate(q,legend),
                 m_series(series),
                 m_barset(barset)
             {
                 QObject::connect(m_barset, SIGNAL(penChanged()), this, SLOT(updated()));
                 QObject::connect(m_barset, SIGNAL(labelChanged()), this, SLOT(updated()));
                 QObject::connect(m_barset, SIGNAL(brushChanged()), this, SLOT(updated()));
                 updated();
             }
             QBarLegendMarkerPrivate::~QBarLegendMarkerPrivate()
             {
                 QObject::disconnect(m_barset, SIGNAL(labelChanged()), this, SLOT(updated()));
                 QObject::disconnect(m_barset, SIGNAL(brushChanged()), this, SLOT(updated()));
                 QObject::disconnect(m_barset, SIGNAL(penChanged()), this, SLOT(updated()));
             }
             void QBarLegendMarkerPrivate::updated()
             {
                 m_item->setPen(m_barset->pen());
                 m_item->setBrush(m_barset->brush());
                 m_item->setLabel(m_barset->label());
             }
             #include "moc_qbarlegendmarker.cpp"
             #include "moc_qbarlegendmarker_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/legend/qbarlegendmarker.h +5 -6

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef QBARLEGENDMARKER_H
             #define QBARLEGENDMARKER_H
             #include <QChartGlobal>
             #include <QLegendMarker>
             #include <QAbstractBarSeries>
             #include <QBarSet>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QLegend;
             class QBarLegendMarkerPrivate;
             class QTCOMMERCIALCHART_EXPORT QBarLegendMarker : public QLegendMarker
             {
                 Q_OBJECT
             public:
                 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)
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QBARLEGENDMARKER_H

src/legend/qlegendmarker.h +9 -7

             /****************************************************************************
              **
              ** Copyright (C) 2012 Digia Plc
              ** All rights reserved.
              ** For any questions to Digia, please use contact form at http://qt.digia.com
              **
              ** This file is part of the Qt Commercial Charts Add-on.
              **
              ** $QT_BEGIN_LICENSE$
              ** Licensees holding valid Qt Commercial licenses may use this file in
              ** accordance with the Qt Commercial License Agreement provided with the
              ** Software or, alternatively, in accordance with the terms contained in
              ** a written agreement between you and Digia.
              **
              ** If you have questions regarding the use of this file, please use
              ** contact form at http://qt.digia.com
              ** $QT_END_LICENSE$
              **
              ****************************************************************************/
             #ifndef QLEGENDMARKER_H
             #define QLEGENDMARKER_H
             #include <QChartGlobal>
             #include <QObject>
             #include <QPen>
             #include <QBrush>
             #include <QFont>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QLegendMarkerPrivate;
             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);
                 QBrush labelBrush() const;
                 void setLabelBrush(const QBrush &brush);
                 QFont font() const;
                 void setFont(const QFont &font);
                 QPen pen() const;
                 void setPen(const QPen &pen);
                 QBrush brush() const;
                 void setBrush(const QBrush &brush);
                 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);
             Q_SIGNALS:
                 void clicked();
                 void hovered(bool status);
             protected:
                 QScopedPointer<QLegendMarkerPrivate> d_ptr;
                 Q_DISABLE_COPY(QLegendMarker)
                 friend class QLegendPrivate;
                 friend class QLegendMarkerPrivate;
                 friend class LegendLayout;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QLEGENDMARKER_H

src/legend/qpielegendmarker.cpp +1 -1

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "qpielegendmarker.h"
             #include "qpielegendmarker_p.h"
             #include <QPieSeries>
             #include <QPieSlice>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             QPieLegendMarker::QPieLegendMarker(QPieSeries* series, QPieSlice* slice, QLegend *legend, QObject *parent) :
                 QLegendMarker(*new QPieLegendMarkerPrivate(this,series,slice,legend), parent)
             {
             }
             QPieLegendMarker::~QPieLegendMarker()
             {
             //    qDebug() << "deleting pie marker" << this;
             }
             /*!
                 \internal
             */
             QPieLegendMarker::QPieLegendMarker(QPieLegendMarkerPrivate &d, QObject *parent) :
                 QLegendMarker(d, parent)
             {
             }
             QPieSeries* QPieLegendMarker::series()
             {
                 Q_D(QPieLegendMarker);
                 return d->m_series;
             }
-            QPieSlice* QPieLegendMarker::peerObject()
+            QPieSlice* QPieLegendMarker::slice()
             {
                 Q_D(QPieLegendMarker);
                 return d->m_slice;
             }
             ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QPieLegendMarkerPrivate::QPieLegendMarkerPrivate(QPieLegendMarker *q, QPieSeries *series, QPieSlice *slice, QLegend *legend) :
                 QLegendMarkerPrivate(q,legend),
                 m_series(series),
                 m_slice(slice)
             {
                 QObject::connect(m_slice, SIGNAL(labelChanged()), this, SLOT(updated()));
                 QObject::connect(m_slice, SIGNAL(brushChanged()), this, SLOT(updated()));
                 QObject::connect(m_slice, SIGNAL(penChanged()), this, SLOT(updated()));
                 updated();
             }
             QPieLegendMarkerPrivate::~QPieLegendMarkerPrivate()
             {
                 QObject::disconnect(m_slice, SIGNAL(labelChanged()), this, SLOT(updated()));
                 QObject::disconnect(m_slice, SIGNAL(brushChanged()), this, SLOT(updated()));
                 QObject::disconnect(m_slice, SIGNAL(penChanged()), this, SLOT(updated()));
             }
             void QPieLegendMarkerPrivate::updated()
             {
                 m_item->setPen(m_slice->pen());
                 m_item->setBrush(m_slice->brush());
                 m_item->setLabel(m_slice->label());
             }
             #include "moc_qpielegendmarker.cpp"
             #include "moc_qpielegendmarker_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/legend/qpielegendmarker.h +5 -6

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef QPIELEGENDMARKER_H
             #define QPIELEGENDMARKER_H
             #include <QChartGlobal>
             #include <QLegendMarker>
             #include <QPieSeries>
             #include <QPieSlice>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QPieLegendMarkerPrivate;
             // TODO: No export? make this private. QLegendMarker should be enough for user of the api (why expose the details?)
             class QTCOMMERCIALCHART_EXPORT QPieLegendMarker : public QLegendMarker
             {
                 Q_OBJECT
             public:
                 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)
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QPIELEGENDMARKER_H

src/legend/qxylegendmarker.cpp 0 -6

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "qxylegendmarker.h"
             #include "qxylegendmarker_p.h"
             #include "qxyseries_p.h"
             #include <QXYSeries>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             QXYLegendMarker::QXYLegendMarker(QXYSeries* series, QLegend *legend, QObject *parent) :
                 QLegendMarker(*new QXYLegendMarkerPrivate(this,series,legend), parent)
             {
             }
             QXYLegendMarker::~QXYLegendMarker()
             {
             //    qDebug() << "deleting xy marker" << this;
             }
             /*!
                 \internal
             */
             QXYLegendMarker::QXYLegendMarker(QXYLegendMarkerPrivate &d, QObject *parent) :
                 QLegendMarker(d, parent)
             {
             }
             QXYSeries* QXYLegendMarker::series()
             {
                 Q_D(QXYLegendMarker);
                 return d->m_series;
             }
-            QXYSeries* QXYLegendMarker::peerObject()
-                Q_D(QXYLegendMarker);
-                return d->m_series;
             ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QXYLegendMarkerPrivate::QXYLegendMarkerPrivate(QXYLegendMarker *q, QXYSeries *series, QLegend *legend) :
                 QLegendMarkerPrivate(q,legend),
                 m_series(series)
             {
                 QObject::connect(m_series, SIGNAL(nameChanged()), this, SLOT(updated()));
                 QObject::connect(m_series->d_func(), SIGNAL(updated()), this, SLOT(updated()));
                 updated();
             }
             QXYLegendMarkerPrivate::~QXYLegendMarkerPrivate()
             {
                 QObject::disconnect(m_series->d_func(), SIGNAL(updated()), this, SLOT(updated()));
                 QObject::disconnect(m_series, SIGNAL(nameChanged()), this, SLOT(updated()));
             }
             void QXYLegendMarkerPrivate::updated()
             {
                 m_item->setLabel(m_series->name());
                 if (m_series->type()== QAbstractSeries::SeriesTypeScatter)  {
                     m_item->setBrush(m_series->brush());
                 } else {
                     m_item->setBrush(QBrush(m_series->pen().color()));
                 }
             }
             #include "moc_qxylegendmarker.cpp"
             #include "moc_qxylegendmarker_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/legend/qxylegendmarker.h +4 -6

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef QXYLEGENDMARKER_H
             #define QXYLEGENDMARKER_H
             #include <QChartGlobal>
             #include <QLegendMarker>
             #include <QXYSeries>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QXYLegendMarkerPrivate;
             class QTCOMMERCIALCHART_EXPORT QXYLegendMarker : public QLegendMarker
             {
                 Q_OBJECT
             public:
                 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)
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QXYLEGENDMARKER_H

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