HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1009:983f422506c5

API review changes for pie

Jani Honkonen -

r1009:983f422506c5

parent child

Context file:

r1009:983f422506c5

Collapse all files

demos/piechartcustomization/customslice.cpp +10 -12

             CustomSlice::CustomSlice(qreal value, QString label)
                 :QPieSlice(value, label)
             {
-                connect(this, SIGNAL(hoverEnter()), this, SLOT(handleHoverEnter()));
+                connect(this, SIGNAL(hovered(bool)), this, SLOT(showHighlight(bool)));
-                connect(this, SIGNAL(hoverLeave()), this, SLOT(handleHoverLeave()));
             }
             QBrush CustomSlice::originalBrush()
                 return m_originalBrush;
             }
-            void CustomSlice::handleHoverEnter()
+            void CustomSlice::showHighlight(bool show)
             {
-                QBrush brush = this->brush();
+                if (show) {
-                m_originalBrush = brush;
+                    QBrush brush = this->brush();
-                brush.setColor(brush.color().lighter());
+                    m_originalBrush = brush;
-                setBrush(brush);
+                    brush.setColor(brush.color().lighter());
+                    setBrush(brush);
+                } else {
-            void CustomSlice::handleHoverLeave()
+                    setBrush(m_originalBrush);
+                }
-                setBrush(m_originalBrush);
             }
             #include "moc_customslice.cpp"

demos/piechartcustomization/customslice.h +1 -2

                 QBrush originalBrush();
             public Q_SLOTS:
-                void handleHoverEnter();
+                void showHighlight(bool show);
-                void handleHoverLeave();
             private:
                 QBrush m_originalBrush;

demos/piechartcustomization/mainwidget.cpp +11 -4

                 m_series->setLabelsVisible();
                 chart->addSeries(m_series);
-                connect(m_series, SIGNAL(clicked(QPieSlice*,Qt::MouseButtons)), this, SLOT(handleSliceClicked(QPieSlice*,Qt::MouseButtons)));
+                connect(m_series, SIGNAL(clicked(QPieSlice*)), this, SLOT(handleSliceClicked(QPieSlice*)));
                 // chart settings
                 m_themeComboBox = new QComboBox();
                 m_animationsCheckBox = new QCheckBox();
                 m_animationsCheckBox->setCheckState(Qt::Checked);
+                m_legendCheckBox = new QCheckBox();
                 QFormLayout* chartSettingsLayout = new QFormLayout();
                 chartSettingsLayout->addRow("Theme", m_themeComboBox);
                 chartSettingsLayout->addRow("Antialiasing", m_aaCheckBox);
                 chartSettingsLayout->addRow("Animations", m_animationsCheckBox);
+                chartSettingsLayout->addRow("Legend", m_legendCheckBox);
                 QGroupBox* chartSettings = new QGroupBox("Chart");
                 chartSettings->setLayout(chartSettingsLayout);
                 connect(m_themeComboBox, SIGNAL(currentIndexChanged(int)), this ,SLOT(updateChartSettings()));
                 connect(m_aaCheckBox, SIGNAL(toggled(bool)), this ,SLOT(updateChartSettings()));
                 connect(m_animationsCheckBox, SIGNAL(toggled(bool)), this ,SLOT(updateChartSettings()));
+                connect(m_legendCheckBox, SIGNAL(toggled(bool)), this ,SLOT(updateChartSettings()));
                 // series settings
                 m_hPosition = new QDoubleSpinBox();
                     m_chartView->chart()->setAnimationOptions(QChart::AllAnimations);
                 else
                     m_chartView->chart()->setAnimationOptions(QChart::NoAnimation);
+                if (m_legendCheckBox->checkState() == Qt::Checked)
+                    m_chartView->chart()->legend()->show();
+                else
+                    m_chartView->chart()->legend()->hide();
             }
             void MainWidget::updateSerieSettings()
                 m_slice->setExplodeDistanceFactor(m_sliceExplodedFactor->value());
             }
-            void MainWidget::handleSliceClicked(QPieSlice* slice, Qt::MouseButtons buttons)
+            void MainWidget::handleSliceClicked(QPieSlice* slice)
             {
-                Q_UNUSED(buttons);
                 m_slice = static_cast<CustomSlice*>(slice);
                 // name

demos/piechartcustomization/mainwidget.h +2 -1

                 void updateChartSettings();
                 void updateSerieSettings();
                 void updateSliceSettings();
-                void handleSliceClicked(QPieSlice* slice, Qt::MouseButtons buttons);
+                void handleSliceClicked(QPieSlice* slice);
                 void showFontDialog();
                 void appendSlice();
                 void insertSlice();
                 QComboBox *m_themeComboBox;
                 QCheckBox *m_aaCheckBox;
                 QCheckBox *m_animationsCheckBox;
+                QCheckBox *m_legendCheckBox;
                 QChartView* m_chartView;
                 QPieSeries* m_series;

examples/piechartdrilldown/drilldownslice.cpp +4 -11

                 updateLabel();
                 setLabelFont(QFont("Arial", 8));
                 connect(this, SIGNAL(changed()), this, SLOT(updateLabel()));
-                connect(this, SIGNAL(hoverEnter()), this, SLOT(showHighlight()));
+                connect(this, SIGNAL(hovered(bool)), this, SLOT(showHighlight(bool)));
-                connect(this, SIGNAL(hoverLeave()), this, SLOT(hideHighlight()));
             }
             DrilldownSlice::~DrilldownSlice()
                 setLabel(label);
             }
-            void DrilldownSlice::showHighlight()
+            void DrilldownSlice::showHighlight(bool show)
             {
-                setExploded();
+                setExploded(show);
-                setLabelVisible();
+                setLabelVisible(show);
-            void DrilldownSlice::hideHighlight()
-                setExploded(false);
-                setLabelVisible(false);
             }
             #include "moc_drilldownslice.cpp"

examples/piechartdrilldown/drilldownslice.h +1 -2

             public Q_SLOTS:
                 void updateLabel();
-                void showHighlight();
+                void showHighlight(bool show);
-                void hideHighlight();
             private:
                 QAbstractSeries* m_drilldownSeries;

examples/piechartdrilldown/main.cpp +2 -2

                     foreach (QString month, months)
                         *series << new DrilldownSlice(qrand() % 1000, month, yearSeries);
-                    QObject::connect(series, SIGNAL(clicked(QPieSlice*,Qt::MouseButtons)), chart, SLOT(handleSliceClicked(QPieSlice*)));
+                    QObject::connect(series, SIGNAL(clicked(QPieSlice*)), chart, SLOT(handleSliceClicked(QPieSlice*)));
                     *yearSeries << new DrilldownSlice(series->sum(), name, series);
                 }
-                QObject::connect(yearSeries, SIGNAL(clicked(QPieSlice*,Qt::MouseButtons)), chart, SLOT(handleSliceClicked(QPieSlice*)));
+                QObject::connect(yearSeries, SIGNAL(clicked(QPieSlice*)), chart, SLOT(handleSliceClicked(QPieSlice*)));
                 chart->changeSeries(yearSeries);

src/legend/legendmarker.cpp +1 -1

             PieLegendMarker::PieLegendMarker(QPieSeries* series,QPieSlice *pieslice, QLegend *legend) : LegendMarker(series,legend),
             m_pieslice(pieslice)
             {
-                QObject::connect(this, SIGNAL(selected()),pieslice, SIGNAL(selected()));
+                QObject::connect(this, SIGNAL(selected()),pieslice, SIGNAL(clicked()));
                 QObject::connect(pieslice, SIGNAL(changed()), this, SLOT(updated()));
                 updated();
             }

src/legend/qlegend.cpp +12 -9

             #include "qpercentbarseries.h"
             #include "qbarset.h"
             #include "qpieseries.h"
+            #include "qpieseries_p.h"
             #include "qpieslice.h"
             #include "chartpresenter_p.h"
             #include <QPainter>
                 if(series->type() == QAbstractSeries::SeriesTypePie)
                 {
                     QPieSeries *pieSeries = static_cast<QPieSeries *>(series);
-                    QObject::connect(pieSeries,SIGNAL(added(QList<QPieSlice*>)),this,SLOT(handleUpdateSeries()));
+                    QPieSeriesPrivate *d = QPieSeriesPrivate::seriesData(*pieSeries);
-                    QObject::connect(pieSeries,SIGNAL(removed(QList<QPieSlice*>)),this,SLOT(handleUpdateSeries()));
+                    QObject::connect(d, SIGNAL(added(QList<QPieSlice*>)), this, SLOT(handleUpdatePieSeries()));
+                    QObject::connect(d, SIGNAL(removed(QList<QPieSlice*>)), this, SLOT(handleUpdatePieSeries()));
                 }
                 updateLayout();
                 if(series->type() == QAbstractSeries::SeriesTypePie)
                 {
                     QPieSeries *pieSeries = static_cast<QPieSeries *>(series);
-                    QObject::disconnect(pieSeries,SIGNAL(added(QList<QPieSlice*>)),this,SLOT(handleUpdateSeries()));
+                    QPieSeriesPrivate *d = QPieSeriesPrivate::seriesData(*pieSeries);
-                    QObject::disconnect(pieSeries,SIGNAL(removed(QList<QPieSlice*>)),this,SLOT(handleUpdateSeries()));
+                    QObject::disconnect(d, SIGNAL(added(QList<QPieSlice*>)), this, SLOT(handleUpdatePieSeries()));
+                    QObject::disconnect(d, SIGNAL(removed(QList<QPieSlice*>)), this, SLOT(handleUpdatePieSeries()));
                 }
                 updateLayout();
             }
-            void QLegendPrivate::handleUpdateSeries()
+            void QLegendPrivate::handleUpdatePieSeries()
             {
                 //TODO: reimplement to be optimal
-                QAbstractSeries* series = qobject_cast<QAbstractSeries *> (sender());
+                QPieSeriesPrivate* d = qobject_cast<QPieSeriesPrivate *> (sender());
-                Q_ASSERT(series);
+                Q_ASSERT(d->q_func());
-                handleSeriesRemoved(series);
+                handleSeriesRemoved(d->q_func());
-                handleSeriesAdded(series,0);
+                handleSeriesAdded(d->q_func(), 0);
             }
             #include "moc_qlegend.cpp"

src/legend/qlegend_p.h +1 -1

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

src/piechart/piechartitem.cpp +9 -7

             #include "piesliceitem_p.h"
             #include "qpieslice.h"
             #include "qpieseries.h"
+            #include "qpieseries_p.h"
             #include "chartpresenter_p.h"
             #include "chartdataset_p.h"
             #include "chartanimator_p.h"
                 m_series(series)
             {
                 Q_ASSERT(series);
-                connect(series, SIGNAL(added(QList<QPieSlice*>)), this, SLOT(handleSlicesAdded(QList<QPieSlice*>)));
-                connect(series, SIGNAL(removed(QList<QPieSlice*>)), this, SLOT(handleSlicesRemoved(QList<QPieSlice*>)));
+                QPieSeriesPrivate *d = QPieSeriesPrivate::seriesData(*series);
-                connect(series, SIGNAL(piePositionChanged()), this, SLOT(handlePieLayoutChanged()));
+                connect(d, SIGNAL(added(QList<QPieSlice*>)), this, SLOT(handleSlicesAdded(QList<QPieSlice*>)));
-                connect(series, SIGNAL(pieSizeChanged()), this, SLOT(handlePieLayoutChanged()));
+                connect(d, SIGNAL(removed(QList<QPieSlice*>)), this, SLOT(handleSlicesRemoved(QList<QPieSlice*>)));
+                connect(d, SIGNAL(piePositionChanged()), this, SLOT(handlePieLayoutChanged()));
+                connect(d, SIGNAL(pieSizeChanged()), this, SLOT(handlePieLayoutChanged()));
                 QTimer::singleShot(0, this, SLOT(initialize())); // TODO: get rid of this
                     PieSliceItem* item = new PieSliceItem(this);
                     m_slices.insert(s, item);
                     connect(s, SIGNAL(changed()), this, SLOT(handleSliceChanged()));
-                    connect(item, SIGNAL(clicked(Qt::MouseButtons)), s, SIGNAL(clicked(Qt::MouseButtons)));
+                    connect(item, SIGNAL(clicked(Qt::MouseButtons)), s, SIGNAL(clicked()));
-                    connect(item, SIGNAL(hoverEnter()), s, SIGNAL(hoverEnter()));
+                    connect(item, SIGNAL(hovered(bool)), s, SIGNAL(hovered(bool)));
-                    connect(item, SIGNAL(hoverLeave()), s, SIGNAL(hoverLeave()));
                     PieSliceData data = sliceData(s);

src/piechart/piesliceitem.cpp +2 -2

             void PieSliceItem::hoverEnterEvent(QGraphicsSceneHoverEvent* /*event*/)
             {
-                emit hoverEnter(); // TODO: refactor emit hover(somebooleanvalue)
+                emit hovered(true);
             }
             void PieSliceItem::hoverLeaveEvent(QGraphicsSceneHoverEvent* /*event*/)
             {
-                emit hoverLeave(); // TODO: refactor emit hover(somebooleanvalue)
+                emit hovered(false);
             }
             void PieSliceItem::mousePressEvent(QGraphicsSceneMouseEvent *event)

src/piechart/piesliceitem_p.h +1 -2

             Q_SIGNALS:
                 void clicked(Qt::MouseButtons buttons);
-                void hoverEnter();
+                void hovered(bool state);
-                void hoverLeave();
             public:
                 void setSliceData(PieSliceData sliceData);

src/piechart/qpieseries.cpp +26 -69

                 foreach (QPieSlice* s, slices) {
                     connect(s, SIGNAL(changed()), d, SLOT(sliceChanged()));
-                    connect(s, SIGNAL(clicked(Qt::MouseButtons)), d, SLOT(sliceClicked(Qt::MouseButtons)));
+                    connect(s, SIGNAL(clicked()), d, SLOT(sliceClicked()));
-                    connect(s, SIGNAL(hoverEnter()), d, SLOT(sliceHoverEnter()));
+                    connect(s, SIGNAL(hovered(bool)), d, SLOT(sliceHovered(bool)));
-                    connect(s, SIGNAL(hoverLeave()), d, SLOT(sliceHoverLeave()));
                 }
-                emit added(slices);
+                emit d->added(slices);
             }
             /*!
                 d->updateDerivativeData();
                 connect(slice, SIGNAL(changed()), d, SLOT(sliceChanged()));
-                connect(slice, SIGNAL(clicked(Qt::MouseButtons)), d, SLOT(sliceClicked(Qt::MouseButtons)));
+                connect(slice, SIGNAL(clicked()), d, SLOT(sliceClicked()));
-                connect(slice, SIGNAL(hoverEnter()), d, SLOT(sliceHoverEnter()));
+                connect(slice, SIGNAL(hovered(bool)), d, SLOT(sliceHovered(bool)));
-                connect(slice, SIGNAL(hoverLeave()), d, SLOT(sliceHoverLeave()));
-                emit added(QList<QPieSlice*>() << slice);
+                emit d->added(QList<QPieSlice*>() << slice);
             }
             /*!
                 d->updateDerivativeData();
-                emit removed(QList<QPieSlice*>() << slice);
+                emit d->removed(QList<QPieSlice*>() << slice);
                 delete slice;
                 slice = 0;
                 d->updateDerivativeData();
-                emit removed(slices);
+                emit d->removed(slices);
             }
             /*!
             {
                 Q_D(QPieSeries);
                 if (d->setRealValue(d->m_pieRelativeHorPos, relativePosition, 1.0))
-                    emit piePositionChanged();
+                    emit d->piePositionChanged();
             }
             void QPieSeries::setVerticalPosition(qreal relativePosition)
             {
                 Q_D(QPieSeries);
                 if (d->setRealValue(d->m_pieRelativeVerPos, relativePosition, 1.0))
-                    emit piePositionChanged();
+                    emit d->piePositionChanged();
             }
             qreal QPieSeries::horizontalPosition() const
             {
                 Q_D(QPieSeries);
                 if (d->setRealValue(d->m_pieRelativeSize, relativeSize, 1.0))
-                    emit pieSizeChanged();
+                    emit d->pieSizeChanged();
             }
             qreal QPieSeries::pieSize() const
             }
             /*!
-                \fn void QPieSeries::clicked(QPieSlice* slice, Qt::MouseButtons buttons)
+                \fn void QPieSeries::clicked(QPieSlice* slice)
-                This signal is emitted when a \a slice has been clicked with mouse \a buttons.
+                This signal is emitted when a \a slice has been clicked.
                 \sa QPieSlice::clicked()
             */
             /*!
-                \fn void QPieSeries::hoverEnter(QPieSlice* slice)
+                \fn void QPieSeries::hovered(QPieSlice* slice, bool state)
-                This signal is emitted when user has hovered over a \a slice.
+                This signal is emitted when user has hovered over or away from the \a slice.
-                \sa QPieSlice::hoverEnter()
+                \a state is true when user has hovered over the slice and false when hover has moved away from the slice.
-            */
-            /*!
-                \fn void QPieSeries::hoverLeave(QPieSlice* slice)
-                This signal is emitted when user has hovered away from a \a slice.
-                \sa QPieSlice::hoverLeave()
-            */
-            /*!
-                \fn void QPieSeries::added(QList<QPieSlice*> slices)
-                This signal is emitted when \a slices has been added to the series.
-                \sa append(), insert()
+                \sa QPieSlice::hovered()
-            */
-            /*!
-                \fn void QPieSeries::removed(QList<QPieSlice*> slices)
-                This signal is emitted when \a slices has been removed from the series.
-                \sa remove(), clear()
-            */
-            /*!
-                \fn void QPieSeries::piePositionChanged()
-                This signal is emitted when pie position has changed.
-                \sa verticalPosition(), setVerticalPosition(), horizontalPosition(), setHorizontalPosition()
-            */
-            /*!
-                \fn void QPieSeries::pieSizeChanged()
-                This signal is emitted when pie size has changed.
-                \sa pieSize(), setPieSize()
             */
             /*!
                     PieSliceData::data(s).emitChangedSignal(s);
             }
-            void QPieSeriesPrivate::sliceChanged()
+            QPieSeriesPrivate* QPieSeriesPrivate::seriesData(QPieSeries &series)
             {
-                Q_ASSERT(m_slices.contains(qobject_cast<QPieSlice *>(sender())));
+                return series.d_func();
-                updateDerivativeData();
             }
-            void QPieSeriesPrivate::sliceClicked(Qt::MouseButtons buttons)
+            void QPieSeriesPrivate::sliceChanged()
             {
-                QPieSlice* slice = qobject_cast<QPieSlice *>(sender());
+                Q_ASSERT(m_slices.contains(qobject_cast<QPieSlice *>(sender())));
-                Q_ASSERT(m_slices.contains(slice));
+                updateDerivativeData();
-                Q_Q(QPieSeries);
-                emit q->clicked(slice, buttons);
             }
-            void QPieSeriesPrivate::sliceHoverEnter()
+            void QPieSeriesPrivate::sliceClicked()
             {
                 QPieSlice* slice = qobject_cast<QPieSlice *>(sender());
                 Q_ASSERT(m_slices.contains(slice));
                 Q_Q(QPieSeries);
-                emit q->hoverEnter(slice);
+                emit q->clicked(slice);
             }
-            void QPieSeriesPrivate::sliceHoverLeave()
+            void QPieSeriesPrivate::sliceHovered(bool state)
             {
                 QPieSlice* slice = qobject_cast<QPieSlice *>(sender());
                 Q_ASSERT(m_slices.contains(slice));
                 Q_Q(QPieSeries);
-                emit q->hoverLeave(slice);
+                emit q->hovered(slice, state);
             }
             void QPieSeriesPrivate::modelUpdated(QModelIndex topLeft, QModelIndex bottomRight)

src/piechart/qpieseries.h +7 -19

                 explicit QPieSeries(QObject *parent = 0);
                 virtual ~QPieSeries();
-            public: // from QChartSeries
                 QSeriesType type() const;
-            public:
-                // slice setters
                 void append(QPieSlice* slice);
                 void append(QList<QPieSlice*> slices);
+                QPieSeries& operator << (QPieSlice* slice);
+                QPieSlice* append(qreal value, QString name);
                 void insert(int index, QPieSlice* slice);
                 void replace(QList<QPieSlice*> slices);
                 void remove(QPieSlice* slice);
                 void clear();
-                // slice getters
                 QList<QPieSlice*> slices() const;
-                // calculated data
                 int count() const;
                 bool isEmpty() const;
                 qreal sum() const;
-                // pie customization
                 void setHorizontalPosition(qreal relativePosition);
                 qreal horizontalPosition() const;
                 void setVerticalPosition(qreal relativePosition);
                 qreal verticalPosition() const;
                 void setPieSize(qreal relativeSize);
                 qreal pieSize() const;
                 void setPieStartAngle(qreal startAngle);
                 qreal pieStartAngle() const;
                 void setPieEndAngle(qreal endAngle);
                 qreal pieEndAngle() const;
-                // convenience function
-                QPieSeries& operator << (QPieSlice* slice);
-                QPieSlice* append(qreal value, QString name);
                 void setLabelsVisible(bool visible = true);
-                // data from model
                 bool setModel(QAbstractItemModel* model);
                 void setModelMapping(int modelValuesLine, int modelLabelsLine, Qt::Orientation orientation = Qt::Vertical);
             Q_SIGNALS:
-                void clicked(QPieSlice* slice, Qt::MouseButtons buttons);
+                void clicked(QPieSlice* slice);
-                void hoverEnter(QPieSlice* slice);
+                void hovered(QPieSlice* slice, bool state);
-                void hoverLeave(QPieSlice* slice);
-                void added(QList<QPieSlice*> slices);
-                void removed(QList<QPieSlice*> slices);
-                void piePositionChanged();
-                void pieSizeChanged();
             private:
                 Q_DECLARE_PRIVATE(QPieSeries)

src/piechart/qpieseries_p.h +15 -5

             class QModelIndex;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
+            class QLegendPrivate;
             class QPieSeriesPrivate : public QAbstractSeriesPrivate
             {
                 ~QPieSeriesPrivate();
                 void scaleDomain(Domain& domain);
-                Chart* createGraphics(ChartPresenter* presenter);
+                Chart* createGraphics(ChartPresenter *presenter);
-                QList<LegendMarker*> createLegendMarker(QLegend* legend);
+                QList<LegendMarker*> createLegendMarker(QLegend *legend);
                 void updateDerivativeData();
+                static QPieSeriesPrivate* seriesData(QPieSeries &series);
+            Q_SIGNALS:
+                void added(QList<QPieSlice*> slices);
+                void removed(QList<QPieSlice*> slices);
+                void piePositionChanged();
+                void pieSizeChanged();
             public Q_SLOTS:
                 void sliceChanged();
-                void sliceClicked(Qt::MouseButtons buttons);
+                void sliceClicked();
-                void sliceHoverEnter();
+                void sliceHovered(bool state);
-                void sliceHoverLeave();
                 void modelUpdated(QModelIndex topLeft, QModelIndex bottomRight);
                 void modelDataAdded(QModelIndex parent, int start, int end);
                 void modelDataRemoved(QModelIndex parent, int start, int end);
                 int m_mapValues;
                 int m_mapLabels;
                 Qt::Orientation m_mapOrientation;
             private:
+                friend class QLegendPrivate;
                 Q_DECLARE_PUBLIC(QPieSeries)
             };

src/piechart/qpieslice.cpp +5 -18

             }
             /*!
-                \fn void QPieSlice::clicked(Qt::MouseButtons buttons)
+                \fn void QPieSlice::clicked()
                 This signal is emitted when user has clicked the slice.
-                Parameter \a buttons hold the information about the clicked mouse buttons.
                 \sa QPieSeries::clicked()
             */
             /*!
-                \fn void QPieSlice::hoverEnter()
+                \fn void QPieSlice::hovered(bool state)
-                This signal is emitted when user has hovered over the slice.
+                This signal is emitted when user has hovered over or away from the slice.
-                \sa QPieSeries::hoverEnter()
+                \a state is true when user has hovered over the slice and false when hover has moved away from the slice.
-            */
-            /*!
-                \fn void QPieSlice::hoverLeave()
-                This signal is emitted when user has hovered away from the slice.
-                \sa QPieSeries::hoverLeave()
+                \sa QPieSeries::hovered()
             */
             /*!
             */
             /*!
-                \fn void QPieSlice::selected()
-                This signal emitted when this slice has been clicked in the legend.
-            */
-            /*!
                 Sets the \a value of this slice.
                 \sa value()
             */

src/piechart/qpieslice.h +7 -11

                 QPieSlice(qreal value, QString label, QObject *parent = 0);
                 virtual ~QPieSlice();
-                // data
                 void setValue(qreal value);
                 qreal value() const;
                 void setLabel(QString label);
                 void setExploded(bool exploded = true);
                 bool isExploded() const;
-                // generated data
-                qreal percentage() const;
-                qreal startAngle() const;
-                qreal endAngle() const;
-                // customization
                 void setPen(const QPen &pen);
                 QPen pen() const;
                 void setBrush(const QBrush &brush);
                 QPen labelPen() const;
                 void setLabelFont(const QFont &font);
                 QFont labelFont() const;
                 void setLabelArmLengthFactor(qreal factor);
                 qreal labelArmLengthFactor() const;
                 void setExplodeDistanceFactor(qreal factor);
                 qreal explodeDistanceFactor() const;
+                qreal percentage() const;
+                qreal startAngle() const;
+                qreal endAngle() const;
             Q_SIGNALS:
-                void clicked(Qt::MouseButtons buttons);
+                void clicked();
-                void hoverEnter();
+                void hovered(bool state);
-                void hoverLeave();
                 void changed();
-                void selected();
             private:
                 friend class PieSliceData;

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