HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1798:4447e4e83da1

Implemented QPieSeries::take()

Jani Honkonen -

r1798:4447e4e83da1

parent child

Context file:

r1798:4447e4e83da1

Collapse all files

src/piechart/qpieseries.cpp +25 0

             /****************************************************************************
             **
             ** 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 "qpieseries.h"
             #include "qpieseries_p.h"
             #include "qpieslice.h"
             #include "qpieslice_p.h"
             #include "pieslicedata_p.h"
             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             #include "legendmarker_p.h"
             #include "qabstractaxis.h"
             #include "pieanimation_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \class QPieSeries
                 \brief Pie series API for QtCommercial Charts
                 The pie series defines a pie chart which consists of pie slices which are defined as QPieSlice objects.
                 The slices can have any values as the QPieSeries will calculate its relative value to the sum of all slices.
                 The actual slice size is determined by that relative value.
                 Pie size and position on the chart is controlled by using relative values which range from 0.0 to 1.0
                 These relate to the actual chart rectangle.
                 By default the pie is defined as a full pie but it can also be a partial pie.
                 This can be done by setting a starting angle and angle span to the series.
                 Full pie is 360 degrees where 0 is at 12 a'clock.
                 See the \l {PieChart Example} {pie chart example} to learn how to create a simple pie chart.
                 \image examples_piechart.png
             */
             /*!
                 \qmlclass PieSeries QPieSeries
                 \inherits AbstractSeries
                 The following QML shows how to create a simple pie chart.
                 \snippet ../demos/qmlchart/qml/qmlchart/View1.qml 1
                 \beginfloatleft
                 \image demos_qmlchart1.png
                 \endfloat
                 \clearfloat
             */
             /*!
                 \property QPieSeries::horizontalPosition
                 \brief Defines the horizontal position of the pie.
                 The value is a relative value to the chart rectangle where:
                 \list
                 \o 0.0 is the absolute left.
                 \o 1.0 is the absolute right.
                 \endlist
                 Default value is 0.5 (center).
                 \sa verticalPosition
             */
             /*!
                 \qmlproperty real PieSeries::horizontalPosition
                 Defines the horizontal position of the pie.
                 The value is a relative value to the chart rectangle where:
                 \list
                 \o 0.0 is the absolute left.
                 \o 1.0 is the absolute right.
                 \endlist
                 Default value is 0.5 (center).
                 \sa verticalPosition
             */
             /*!
                 \property QPieSeries::verticalPosition
                 \brief Defines the vertical position of the pie.
                 The value is a relative value to the chart rectangle where:
                 \list
                 \o 0.0 is the absolute top.
                 \o 1.0 is the absolute bottom.
                 \endlist
                 Default value is 0.5 (center).
                 \sa horizontalPosition
             */
             /*!
                 \qmlproperty real PieSeries::verticalPosition
                 Defines the vertical position of the pie.
                 The value is a relative value to the chart rectangle where:
                 \list
                 \o 0.0 is the absolute top.
                 \o 1.0 is the absolute bottom.
                 \endlist
                 Default value is 0.5 (center).
                 \sa horizontalPosition
             */
             /*!
                 \property QPieSeries::size
                 \brief Defines the pie size.
                 The value is a relative value to the chart rectangle where:
                 \list
                 \o 0.0 is the minimum size (pie not drawn).
                 \o 1.0 is the maximum size that can fit the chart.
                 \endlist
                 When setting this property the donutInnerSize property is adjusted if necessary, to ensure that the inner size is not greater than the outer size.
                 Default value is 0.7.
             */
             /*!
                 \qmlproperty real PieSeries::size
                 Defines the pie size.
                 The value is a relative value to the chart rectangle where:
                 \list
                 \o 0.0 is the minimum size (pie not drawn).
                 \o 1.0 is the maximum size that can fit the chart.
                 \endlist
                 Default value is 0.7.
             */
             /*!
                 \property QPieSeries::donutInnerSize
                 \brief Defines the donut inner size.
                 The value is a relative value to the chart rectangle where:
                 \list
                 \o 0.0 is the minimum size (pie not drawn).
                 \o 1.0 is the maximum size that can fit the chart. (donut has no width)
                 \endlist
                 The value is never greater then size property.
                 Default value is 0.5.
             */
             /*!
                 \qmlproperty real PieSeries::donutInnerSize
                 Defines the donut inner size.
                 The value is a relative value to the chart rectangle where:
                 \list
                 \o 0.0 is the minimum size (donut is a pie).
                 \o 1.0 is the maximum size that can fit the chart. (donut has no width)
                 \endlist
                 When setting this property the size property is adjusted if necessary, to ensure that the inner size is not greater than the outer size.
                 Default value is 0.5.
             */
             /*!
                 \property QPieSeries::startAngle
                 \brief Defines the starting angle of the pie.
                 Full pie is 360 degrees where 0 degrees is at 12 a'clock.
                 Default is value is 0.
             */
             /*!
                 \qmlproperty real PieSeries::startAngle
                 Defines the starting angle of the pie.
                 Full pie is 360 degrees where 0 degrees is at 12 a'clock.
                 Default is value is 0.
             */
             /*!
                 \property QPieSeries::endAngle
                 \brief Defines the ending angle of the pie.
                 Full pie is 360 degrees where 0 degrees is at 12 a'clock.
                 Default is value is 360.
             */
             /*!
                 \qmlproperty real PieSeries::endAngle
                 Defines the ending angle of the pie.
                 Full pie is 360 degrees where 0 degrees is at 12 a'clock.
                 Default is value is 360.
             */
             /*!
                 \property QPieSeries::count
                 Number of slices in the series.
             */
             /*!
                 \qmlproperty int PieSeries::count
                 Number of slices in the series.
             */
             /*!
                 \property QPieSeries::donut
                 Defines whether the series should be drawn as a donut
             */
             /*!
                 \qmlproperty int PieSeries::donut
                 Defines whether the series should be drawn as a donut
             */
             /*!
                 \fn void QPieSeries::countChanged()
                 Emitted when the slice count has changed.
                 \sa count
             */
             /*!
                 \qmlsignal PieSeries::onCountChanged()
                 Emitted when the slice count has changed.
             */
             /*!
                 \property QPieSeries::sum
                 Sum of all slices.
                 The series keeps track of the sum of all slices it holds.
             */
             /*!
                 \qmlproperty real PieSeries::sum
                 Sum of all slices.
                 The series keeps track of the sum of all slices it holds.
             */
             /*!
                 \fn void QPieSeries::sumChanged()
                 Emitted when the sum of all slices has changed.
                 \sa sum
             */
             /*!
                 \qmlsignal PieSeries::onSumChanged()
                 Emitted when the sum of all slices has changed. This may happen for example if you add or remove slices, or if you
                 change value of a slice.
             */
             /*!
                 \fn void QPieSeries::added(QList<QPieSlice*> slices)
                 This signal is emitted when \a slices have been added to the series.
                 \sa append(), insert()
             */
             /*!
                 \qmlsignal PieSeries::onAdded(PieSlice slice)
                 Emitted when \a slice has been added to the series.
             */
             /*!
                 \fn void QPieSeries::removed(QList<QPieSlice*> slices)
                 This signal is emitted when \a slices have been removed from the series.
                 \sa remove()
             */
             /*!
                 \qmlsignal PieSeries::onRemoved(PieSlice slice)
                 Emitted when \a slice has been removed from the series.
             */
             /*!
                 \fn void QPieSeries::clicked(QPieSlice* slice)
                 This signal is emitted when a \a slice has been clicked.
                 \sa QPieSlice::clicked()
             */
             /*!
               \qmlsignal PieSeries::onClicked(PieSlice slice)
               This signal is emitted when a \a slice has been clicked.
             */
             /*!
                 \fn void QPieSeries::hovered(QPieSlice* slice, bool state)
                 This signal is emitted when user has hovered over or away from the \a slice.
                 \a state is true when user has hovered over the slice and false when hover has moved away from the slice.
                 \sa QPieSlice::hovered()
             */
             /*!
                 \qmlsignal PieSeries::onHovered(PieSlice slice, bool state)
                 This signal is emitted when user has hovered over or away from the \a slice. \a state is true when user has hovered
                 over the slice and false when hover has moved away from the slice.
             */
             /*!
                 \qmlmethod PieSlice PieSeries::at(int index)
                 Returns slice at \a index. Returns null if the index is not valid.
             */
             /*!
                 \qmlmethod PieSlice PieSeries::find(string label)
                 Returns the first slice with \a label. Returns null if the index is not valid.
             */
             /*!
                 \qmlmethod PieSlice PieSeries::append(string label, real value)
                 Adds a new slice with \a label and \a value to the pie.
             */
             /*!
                 \qmlmethod bool PieSeries::remove(PieSlice slice)
                 Removes the \a slice from the pie. Returns true if the removal was successfull, false otherwise.
             */
             /*!
                 \qmlmethod PieSeries::clear()
                 Removes all slices from the pie.
             */
             /*!
                 Constructs a series object which is a child of \a parent.
             */
             QPieSeries::QPieSeries(QObject *parent) :
                 QAbstractSeries(*new QPieSeriesPrivate(this),parent)
             {
             }
             /*!
                 Destroys the series and its slices.
             */
             QPieSeries::~QPieSeries()
             {
                 // NOTE: d_prt destroyed by QObject
             }
             /*!
                 Returns QChartSeries::SeriesTypePie.
             */
             QAbstractSeries::SeriesType QPieSeries::type() const
             {
                 return QAbstractSeries::SeriesTypePie;
             }
             /*!
                 Appends a single \a slice to the series.
                 Slice ownership is passed to the series.
                 Returns true if append was succesfull.
             */
             bool QPieSeries::append(QPieSlice* slice)
             {
                 return append(QList<QPieSlice*>() << slice);
             }
             /*!
                 Appends an array of \a slices to the series.
                 Slice ownership is passed to the series.
                 Returns true if append was successfull.
             */
             bool QPieSeries::append(QList<QPieSlice*> slices)
             {
                 Q_D(QPieSeries);
                 if (slices.count() == 0)
                     return false;
                 foreach (QPieSlice* s, slices) {
                     if (!s || d->m_slices.contains(s))
                         return false;
                     if (s->series()) // already added to some series
                         return false;
                 }
                 foreach (QPieSlice* s, slices) {
                     s->setParent(this);
                     QPieSlicePrivate::fromSlice(s)->m_series = this;
                     d->m_slices << s;
                 }
                 d->updateDerivativeData();
                 foreach (QPieSlice* s, slices) {
                     connect(s, SIGNAL(valueChanged()), d, SLOT(sliceValueChanged()));
                     connect(s, SIGNAL(clicked()), d, SLOT(sliceClicked()));
                     connect(s, SIGNAL(hovered(bool)), d, SLOT(sliceHovered(bool)));
                 }
                 emit added(slices);
                 emit countChanged();
                 return true;
             }
             /*!
                 Appends a single \a slice to the series and returns a reference to the series.
                 Slice ownership is passed to the series.
             */
             QPieSeries& QPieSeries::operator << (QPieSlice* slice)
             {
                 append(slice);
                 return *this;
             }
             /*!
                 Appends a single slice to the series with give \a value and \a label.
                 Slice ownership is passed to the series.
             */
             QPieSlice* QPieSeries::append(QString label, qreal value)
             {
                 QPieSlice* slice = new QPieSlice(label, value);
                 append(slice);
                 return slice;
             }
             /*!
                 Inserts a single \a slice to the series before the slice at \a index position.
                 Slice ownership is passed to the series.
                 Returns true if insert was successfull.
             */
             bool QPieSeries::insert(int index, QPieSlice* slice)
             {
                 Q_D(QPieSeries);
                 if (index < 0 || index > d->m_slices.count())
                     return false;
                 if (!slice || d->m_slices.contains(slice))
                     return false;
                 if (slice->series()) // already added to some series
                     return false;
                 slice->setParent(this);
                 QPieSlicePrivate::fromSlice(slice)->m_series = this;
                 d->m_slices.insert(index, slice);
                 d->updateDerivativeData();
                 connect(slice, SIGNAL(valueChanged()), d, SLOT(sliceValueChanged()));
                 connect(slice, SIGNAL(clicked()), d, SLOT(sliceClicked()));
                 connect(slice, SIGNAL(hovered(bool)), d, SLOT(sliceHovered(bool)));
                 emit added(QList<QPieSlice*>() << slice);
                 emit countChanged();
                 return true;
             }
             /*!
                 Removes a single \a slice from the series and deletes the slice.
                 Do not reference the pointer after this call.
                 Returns true if remove was successfull.
             */
             bool QPieSeries::remove(QPieSlice* slice)
             {
                 Q_D(QPieSeries);
                 if (!d->m_slices.removeOne(slice))
                     return false;
                 d->updateDerivativeData();
                 emit removed(QList<QPieSlice*>() << slice);
                 emit countChanged();
                 delete slice;
                 slice = 0;
                 return true;
             }
             /*!
+                Takes a single \a slice from the series. Does not destroy the slice object.
+                NOTE: The series remains as the slice's parent object. You must set the
+                parent object to take full ownership.
+                Returns true if take was successfull.
+            */
+            bool QPieSeries::take(QPieSlice* slice)
+            {
+                Q_D(QPieSeries);
+                if (!d->m_slices.removeOne(slice))
+                    return false;
+                QPieSlicePrivate::fromSlice(slice)->m_series = 0;
+                d->updateDerivativeData();
+                emit removed(QList<QPieSlice*>() << slice);
+                emit countChanged();
+                return true;
+            }
+            /*!
                 Clears all slices from the series.
             */
             void QPieSeries::clear()
             {
                 Q_D(QPieSeries);
                 if (d->m_slices.count() == 0)
                     return;
                 QList<QPieSlice*> slices = d->m_slices;
                 foreach (QPieSlice* s, d->m_slices) {
                     d->m_slices.removeOne(s);
                     delete s;
                 }
                 d->updateDerivativeData();
                 emit removed(slices);
                 emit countChanged();
             }
             /*!
                 Returns a list of slices that belong to this series.
             */
             QList<QPieSlice*> QPieSeries::slices() const
             {
                 Q_D(const QPieSeries);
                 return d->m_slices;
             }
             /*!
                 returns the number of the slices in this series.
             */
             int QPieSeries::count() const
             {
                 Q_D(const QPieSeries);
                 return d->m_slices.count();
             }
             /*!
                 Returns true is the series is empty.
             */
             bool QPieSeries::isEmpty() const
             {
                 Q_D(const QPieSeries);
                 return d->m_slices.isEmpty();
             }
             /*!
                 Returns the sum of all slice values in this series.
                 \sa QPieSlice::value(), QPieSlice::setValue(), QPieSlice::percentage()
             */
             qreal QPieSeries::sum() const
             {
                 Q_D(const QPieSeries);
                 return d->m_sum;
             }
             void QPieSeries::setDonut(bool donut)
             {
                 Q_D(QPieSeries);
                 d->m_donutChart = donut;
                 d->updateDerivativeData();
             }
             bool QPieSeries::donut() const
             {
                 Q_D(const QPieSeries);
                 return d->m_donutChart;
             }
             void QPieSeries::setDonutInnerSize(qreal innerSize)
             {
                 Q_D(QPieSeries);
                 innerSize = qBound((qreal)0.0, innerSize, (qreal)1.0);
                 d->setSizes(innerSize, qMax(d->m_pieRelativeSize, innerSize));
             }
             qreal QPieSeries::donutInnerSize() const
             {
                 Q_D(const QPieSeries);
                 return d->m_donutRelativeInnerSize;
             }
             void QPieSeries::setHorizontalPosition(qreal relativePosition)
             {
                 Q_D(QPieSeries);
                 if (relativePosition < 0.0)
                     relativePosition = 0.0;
                 if (relativePosition > 1.0)
                     relativePosition = 1.0;
                 if (!qFuzzyIsNull(d->m_pieRelativeHorPos - relativePosition)) {
                     d->m_pieRelativeHorPos = relativePosition;
                     emit d->horizontalPositionChanged();
                 }
             }
             qreal QPieSeries::horizontalPosition() const
             {
                 Q_D(const QPieSeries);
                 return d->m_pieRelativeHorPos;
             }
             void QPieSeries::setVerticalPosition(qreal relativePosition)
             {
                 Q_D(QPieSeries);
                 if (relativePosition < 0.0)
                     relativePosition = 0.0;
                 if (relativePosition > 1.0)
                     relativePosition = 1.0;
                 if (!qFuzzyIsNull(d->m_pieRelativeVerPos - relativePosition)) {
                     d->m_pieRelativeVerPos = relativePosition;
                     emit d->verticalPositionChanged();
                 }
             }
             qreal QPieSeries::verticalPosition() const
             {
                 Q_D(const QPieSeries);
                 return d->m_pieRelativeVerPos;
             }
             void QPieSeries::setPieSize(qreal relativeSize)
             {
                 Q_D(QPieSeries);
                 relativeSize = qBound((qreal)0.0, relativeSize, (qreal)1.0);
                 d->setSizes(qMin(d->m_donutRelativeInnerSize, relativeSize), relativeSize);
             }
             qreal QPieSeries::pieSize() const
             {
                 Q_D(const QPieSeries);
                 return d->m_pieRelativeSize;
             }
             void QPieSeries::setPieStartAngle(qreal angle)
             {
                 Q_D(QPieSeries);
                 if (qFuzzyIsNull(d->m_pieStartAngle - angle))
                     return;
                 d->m_pieStartAngle = angle;
                 d->updateDerivativeData();
                 emit d->pieStartAngleChanged();
             }
             qreal QPieSeries::pieStartAngle() const
             {
                 Q_D(const QPieSeries);
                 return d->m_pieStartAngle;
             }
             /*!
                 Sets the end angle of the pie.
                 Full pie is 360 degrees where 0 degrees is at 12 a'clock.
                 \a angle must be greater than start angle.
                 \sa pieEndAngle(), pieStartAngle(), setPieStartAngle()
             */
             void QPieSeries::setPieEndAngle(qreal angle)
             {
                 Q_D(QPieSeries);
                 if (qFuzzyIsNull(d->m_pieEndAngle - angle))
                     return;
                 d->m_pieEndAngle = angle;
                 d->updateDerivativeData();
                 emit d->pieEndAngleChanged();
             }
             /*!
                 Returns the end angle of the pie.
                 Full pie is 360 degrees where 0 degrees is at 12 a'clock.
                 \sa setPieEndAngle(), pieStartAngle(), setPieStartAngle()
             */
             qreal QPieSeries::pieEndAngle() const
             {
                 Q_D(const QPieSeries);
                 return d->m_pieEndAngle;
             }
             /*!
                 Sets the all the slice labels \a visible or invisible.
                 Note that this affects only the current slices in the series.
                 If user adds a new slice the default label visibility is false.
                 \sa QPieSlice::isLabelVisible(), QPieSlice::setLabelVisible()
             */
             void QPieSeries::setLabelsVisible(bool visible)
             {
                 Q_D(QPieSeries);
                 foreach (QPieSlice* s, d->m_slices)
                     s->setLabelVisible(visible);
             }
             /*!
                 Sets the all the slice labels \a position
                 Note that this affects only the current slices in the series.
                 If user adds a new slice the default label position is LabelOutside
                 \sa QPieSlice::labelPosition(), QPieSlice::setLabelPosition()
             */
             void QPieSeries::setLabelsPosition(QPieSlice::LabelPosition position)
             {
                 Q_D(QPieSeries);
                 foreach (QPieSlice* s, d->m_slices)
                     s->setLabelPosition(position);
             }
             ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QPieSeriesPrivate::QPieSeriesPrivate(QPieSeries *parent) :
                 QAbstractSeriesPrivate(parent),
                 m_pieRelativeHorPos(0.5),
                 m_pieRelativeVerPos(0.5),
                 m_pieRelativeSize(0.7),
                 m_pieStartAngle(0),
                 m_pieEndAngle(360),
                 m_sum(0),
                 m_donutChart(false),
                 m_donutRelativeInnerSize(0.5)
             {
             }
             QPieSeriesPrivate::~QPieSeriesPrivate()
             {
             }
             void QPieSeriesPrivate::updateDerivativeData()
             {
                 // calculate sum of all slices
                 qreal sum = 0;
                 foreach (QPieSlice* s, m_slices)
                     sum += s->value();
                 if (!qFuzzyIsNull(m_sum - sum)) {
                     m_sum = sum;
                     emit q_func()->sumChanged();
                 }
                 // nothing to show..
                 if (qFuzzyIsNull(m_sum))
                     return;
                 // update slice attributes
                 qreal sliceAngle = m_pieStartAngle;
                 qreal pieSpan = m_pieEndAngle - m_pieStartAngle;
                 QVector<QPieSlice*> changed;
                 foreach (QPieSlice* s, m_slices) {
                     QPieSlicePrivate *d = QPieSlicePrivate::fromSlice(s);
                     d->setPercentage(s->value() / m_sum);
                     d->setStartAngle(sliceAngle);
                     d->setAngleSpan(pieSpan * s->percentage());
                     sliceAngle += s->angleSpan();
                 }
                 emit calculatedDataChanged();
             }
             void QPieSeriesPrivate::setSizes(qreal innerSize, qreal outerSize)
             {
                 bool changed = false;
                 if (!qFuzzyIsNull(m_donutRelativeInnerSize - innerSize)) {
                     m_donutRelativeInnerSize = innerSize;
                     changed = true;
                 }
                 if (!qFuzzyIsNull(m_pieRelativeSize - outerSize)) {
                     m_pieRelativeSize = outerSize;
                     changed = true;
                 }
                 if (changed)
                     emit pieSizeChanged();
             }
             QPieSeriesPrivate* QPieSeriesPrivate::fromSeries(QPieSeries *series)
             {
                 return series->d_func();
             }
             void QPieSeriesPrivate::sliceValueChanged()
             {
                 Q_ASSERT(m_slices.contains(qobject_cast<QPieSlice *>(sender())));
                 updateDerivativeData();
             }
             void QPieSeriesPrivate::sliceClicked()
             {
                 QPieSlice* slice = qobject_cast<QPieSlice *>(sender());
                 Q_ASSERT(m_slices.contains(slice));
                 Q_Q(QPieSeries);
                 emit q->clicked(slice);
             }
             void QPieSeriesPrivate::sliceHovered(bool state)
             {
                 QPieSlice* slice = qobject_cast<QPieSlice *>(sender());
                 Q_ASSERT(m_slices.contains(slice));
                 Q_Q(QPieSeries);
                 emit q->hovered(slice, state);
             }
             void QPieSeriesPrivate::scaleDomain(Domain& domain)
             {
                 Q_UNUSED(domain);
                 // does not apply to pie
             }
             ChartElement* QPieSeriesPrivate::createGraphics(ChartPresenter* presenter)
             {
                 Q_Q(QPieSeries);
                 PieChartItem* pie = new PieChartItem(q,presenter);
                 if(presenter->animationOptions().testFlag(QChart::SeriesAnimations)) {
                     pie->setAnimation(new PieAnimation(pie));
                 }
                 presenter->chartTheme()->decorate(q, presenter->dataSet()->seriesIndex(q));
                 return pie;
             }
             QList<LegendMarker*> QPieSeriesPrivate::createLegendMarker(QLegend* legend)
             {
                 Q_Q(QPieSeries);
                 QList<LegendMarker*> markers;
                 foreach(QPieSlice* slice, q->slices()) {
                     PieLegendMarker* marker = new PieLegendMarker(q,slice,legend);
                     markers << marker;
                 }
                 return markers;
             }
             void QPieSeriesPrivate::initializeAxis(QAbstractAxis* axis)
             {
                 Q_UNUSED(axis);
             }
             QAbstractAxis::AxisType QPieSeriesPrivate::defaultAxisType(Qt::Orientation orientation) const
             {
                 Q_UNUSED(orientation);
                 return QAbstractAxis::AxisTypeNoAxis;
             }
             #include "moc_qpieseries.cpp"
             #include "moc_qpieseries_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/piechart/qpieseries.h +1 0

             /****************************************************************************
             **
             ** 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 PIESERIES_H
             #define PIESERIES_H
             #include <qabstractseries.h>
             #include <QPieSlice>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QPieSeriesPrivate;
             //class QPieSlice;
             class QTCOMMERCIALCHART_EXPORT QPieSeries : public QAbstractSeries
             {
                 Q_OBJECT
                 Q_PROPERTY(qreal horizontalPosition READ horizontalPosition WRITE setHorizontalPosition)
                 Q_PROPERTY(qreal verticalPosition READ verticalPosition WRITE setVerticalPosition)
                 Q_PROPERTY(qreal size READ pieSize WRITE setPieSize)
                 Q_PROPERTY(qreal startAngle READ pieStartAngle WRITE setPieStartAngle)
                 Q_PROPERTY(qreal endAngle READ pieEndAngle WRITE setPieEndAngle)
                 Q_PROPERTY(int count READ count NOTIFY countChanged)
                 Q_PROPERTY(qreal sum READ sum NOTIFY sumChanged)
                 Q_PROPERTY(qreal donutInnerSize READ donutInnerSize WRITE setDonutInnerSize)
                 Q_PROPERTY(bool donut READ donut WRITE setDonut)
             public:
                 explicit QPieSeries(QObject *parent = 0);
                 virtual ~QPieSeries();
                 QAbstractSeries::SeriesType type() const;
                 bool append(QPieSlice* slice);
                 bool append(QList<QPieSlice*> slices);
                 QPieSeries& operator << (QPieSlice* slice);
                 QPieSlice* append(QString label, qreal value);
                 bool insert(int index, QPieSlice* slice);
                 bool remove(QPieSlice* slice);
+                bool take(QPieSlice* slice);
                 void clear();
                 QList<QPieSlice*> slices() const;
                 int count() const;
                 bool isEmpty() const;
                 qreal sum() const;
                 void setDonut(bool donut = true);
                 bool donut() const;
                 void setDonutInnerSize(qreal innerSize);
                 qreal donutInnerSize() const;
                 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;
                 void setLabelsVisible(bool visible = true);
                 void setLabelsPosition(QPieSlice::LabelPosition position);
             Q_SIGNALS:
                 void added(QList<QPieSlice*> slices);
                 void removed(QList<QPieSlice*> slices);
                 void clicked(QPieSlice* slice);
                 void hovered(QPieSlice* slice, bool state);
                 void countChanged();
                 void sumChanged();
             private:
                 Q_DECLARE_PRIVATE(QPieSeries)
                 Q_DISABLE_COPY(QPieSeries)
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // PIESERIES_H

tests/auto/qpieseries/tst_qpieseries.cpp +39 0

             /****************************************************************************
             **
             ** 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 <QtTest/QtTest>
             #include <qchartview.h>
             #include <qchart.h>
             #include <qpieseries.h>
             #include <qpieslice.h>
             #include <qpiemodelmapper.h>
             #include <QStandardItemModel>
             #include <tst_definitions.h>
             QTCOMMERCIALCHART_USE_NAMESPACE
             Q_DECLARE_METATYPE(QPieSlice*)
             Q_DECLARE_METATYPE(QList<QPieSlice*>)
             class tst_qpieseries : public QObject
             {
                 Q_OBJECT
             public slots:
                 void initTestCase();
                 void cleanupTestCase();
                 void init();
                 void cleanup();
             private slots:
                 void properties();
                 void append();
                 void appendAnimated();
                 void insert();
                 void insertAnimated();
                 void remove();
                 void removeAnimated();
+                void take();
+                void takeAnimated();
                 void calculatedValues();
                 void clickedSignal();
                 void hoverSignal();
                 void sliceSeries();
                 void destruction();
             private:
                 void verifyCalculatedData(const QPieSeries &series, bool *ok);
             private:
                 QChartView *m_view;
                 QPieSeries *m_series;
             };
             void tst_qpieseries::initTestCase()
             {
                 qRegisterMetaType<QPieSlice*>("QPieSlice*");
                 qRegisterMetaType<QList<QPieSlice*> >("QList<QPieSlice*>");
             }
             void tst_qpieseries::cleanupTestCase()
             {
             }
             void tst_qpieseries::init()
             {
                 m_view = new QChartView();
                 m_series = new QPieSeries(m_view);
                 m_view->show();
                 QTest::qWaitForWindowShown(m_view);
             }
             void tst_qpieseries::cleanup()
             {
                 delete m_view;
                 m_view = 0;
                 m_series = 0;
             }
             void tst_qpieseries::properties()
             {
                 QSignalSpy countSpy(m_series, SIGNAL(countChanged()));
                 QSignalSpy sumSpy(m_series, SIGNAL(sumChanged()));
                 QVERIFY(m_series->type() == QAbstractSeries::SeriesTypePie);
                 QVERIFY(m_series->count() == 0);
                 QVERIFY(m_series->isEmpty());
                 QCOMPARE(m_series->sum(), 0.0);
                 QCOMPARE(m_series->horizontalPosition(), 0.5);
                 QCOMPARE(m_series->verticalPosition(), 0.5);
                 QCOMPARE(m_series->pieSize(), 0.7);
                 QCOMPARE(m_series->pieStartAngle(), 0.0);
                 QCOMPARE(m_series->pieEndAngle(), 360.0);
                 m_series->append("s1", 1);
                 m_series->append("s2", 1);
                 m_series->append("s3", 1);
                 m_series->insert(1, new QPieSlice("s4", 1));
                 m_series->remove(m_series->slices().first());
                 QCOMPARE(m_series->count(), 3);
                 QCOMPARE(m_series->sum(), 3.0);
                 m_series->clear();
                 QCOMPARE(m_series->count(), 0);
                 QCOMPARE(m_series->sum(), 0.0);
                 QCOMPARE(countSpy.count(), 6);
                 QCOMPARE(sumSpy.count(), 6);
                 m_series->setPieSize(-1.0);
                 QCOMPARE(m_series->pieSize(), 0.0);
                 m_series->setPieSize(0.0);
                 m_series->setPieSize(0.9);
                 m_series->setPieSize(2.0);
                 QCOMPARE(m_series->pieSize(), 1.0);
                 m_series->setPieSize(0.7);
                 QCOMPARE(m_series->pieSize(), 0.7);
                 m_series->setDonut();
                 QVERIFY(m_series->donut());
                 m_series->setDonutInnerSize(-1.0);
                 QCOMPARE(m_series->donutInnerSize(), 0.0);
                 m_series->setDonutInnerSize(0.5);
                 QCOMPARE(m_series->donutInnerSize(), 0.5);
                 m_series->setDonutInnerSize(0.8);
                 QCOMPARE(m_series->donutInnerSize(), 0.8);
                 QCOMPARE(m_series->pieSize(), 0.8);
                 m_series->setPieSize(0.4);
                 QCOMPARE(m_series->pieSize(), 0.4);
                 QCOMPARE(m_series->donutInnerSize(), 0.4);
                 m_series->setPieStartAngle(0);
                 m_series->setPieStartAngle(-180);
                 m_series->setPieStartAngle(180);
                 QCOMPARE(m_series->pieStartAngle(), 180.0);
                 m_series->setPieEndAngle(360);
                 m_series->setPieEndAngle(-180);
                 m_series->setPieEndAngle(180);
                 QCOMPARE(m_series->pieEndAngle(), 180.0);
                 m_series->setHorizontalPosition(0.5);
                 m_series->setHorizontalPosition(-1.0);
                 QCOMPARE(m_series->horizontalPosition(), 0.0);
                 m_series->setHorizontalPosition(1.0);
                 m_series->setHorizontalPosition(2.0);
                 QCOMPARE(m_series->horizontalPosition(), 1.0);
                 m_series->setVerticalPosition(0.5);
                 m_series->setVerticalPosition(-1.0);
                 QCOMPARE(m_series->verticalPosition(), 0.0);
                 m_series->setVerticalPosition(1.0);
                 m_series->setVerticalPosition(2.0);
                 QCOMPARE(m_series->verticalPosition(), 1.0);
             }
             void tst_qpieseries::append()
             {
                 m_view->chart()->addSeries(m_series);
                 QSignalSpy addedSpy(m_series, SIGNAL(added(QList<QPieSlice*>)));
                 // append pointer
                 QPieSlice *slice1 = 0;
                 QVERIFY(!m_series->append(slice1));
                 slice1 = new QPieSlice("slice 1", 1);
                 QVERIFY(m_series->append(slice1));
                 QVERIFY(!m_series->append(slice1));
                 QCOMPARE(m_series->count(), 1);
                 QCOMPARE(addedSpy.count(), 1);
                 QList<QPieSlice*> added = qvariant_cast<QList<QPieSlice*> >(addedSpy.at(0).at(0));
                 QCOMPARE(added.count(), 1);
                 QCOMPARE(added.first(), slice1);
                 // try to append same slice to another series
                 QPieSeries series2;
                 QVERIFY(!series2.append(slice1));
                 // append pointer list
                 QList<QPieSlice *> list;
                 QVERIFY(!m_series->append(list));
                 list << (QPieSlice *) 0;
                 QVERIFY(!m_series->append(list));
                 list.clear();
                 list << new QPieSlice("slice 2", 2);
                 list << new QPieSlice("slice 3", 3);
                 QVERIFY(m_series->append(list));
                 QVERIFY(!m_series->append(list));
                 QCOMPARE(m_series->count(), 3);
                 QCOMPARE(addedSpy.count(), 2);
                 added = qvariant_cast<QList<QPieSlice*> >(addedSpy.at(1).at(0));
                 QCOMPARE(added.count(), 2);
                 QCOMPARE(added, list);
                 // append operator
                 QPieSlice *slice4 = new QPieSlice("slice 4", 4);
                 *m_series << slice4;
                 *m_series << slice1; // fails because already added
                 QCOMPARE(m_series->count(), 4);
                 QCOMPARE(addedSpy.count(), 3);
                 added = qvariant_cast<QList<QPieSlice*> >(addedSpy.at(2).at(0));
                 QCOMPARE(added.count(), 1);
                 QCOMPARE(added.first(), slice4);
                 // append with params
                 QPieSlice *slice5 = m_series->append("slice 5", 5);
                 QVERIFY(slice5 != 0);
                 QCOMPARE(slice5->value(), 5.0);
                 QCOMPARE(slice5->label(), QString("slice 5"));
                 QCOMPARE(m_series->count(), 5);
                 QCOMPARE(addedSpy.count(), 4);
                 added = qvariant_cast<QList<QPieSlice*> >(addedSpy.at(3).at(0));
                 QCOMPARE(added.count(), 1);
                 QCOMPARE(added.first(), slice5);
                 // check slices
                 QVERIFY(!m_series->isEmpty());
                 for (int i=0; i<m_series->count(); i++) {
                     QCOMPARE(m_series->slices().at(i)->value(), (qreal) i+1);
                     QCOMPARE(m_series->slices().at(i)->label(), QString("slice ") + QString::number(i+1));
                 }
             }
             void tst_qpieseries::appendAnimated()
             {
                 m_view->chart()->setAnimationOptions(QChart::AllAnimations);
                 append();
             }
             void tst_qpieseries::insert()
             {
                 m_view->chart()->addSeries(m_series);
                 QSignalSpy addedSpy(m_series, SIGNAL(added(QList<QPieSlice*>)));
                 // insert one slice
                 QPieSlice *slice1 = 0;
                 QVERIFY(!m_series->insert(0, slice1));
                 slice1 = new QPieSlice("slice 1", 1);
                 QVERIFY(!m_series->insert(-1, slice1));
                 QVERIFY(!m_series->insert(5, slice1));
                 QVERIFY(m_series->insert(0, slice1));
                 QVERIFY(!m_series->insert(0, slice1));
                 QCOMPARE(m_series->count(), 1);
                 QCOMPARE(addedSpy.count(), 1);
                 QList<QPieSlice*> added = qvariant_cast<QList<QPieSlice*> >(addedSpy.at(0).at(0));
                 QCOMPARE(added.count(), 1);
                 QCOMPARE(added.first(), slice1);
                 // try to insert same slice to another series
                 QPieSeries series2;
                 QVERIFY(!series2.insert(0, slice1));
                 // add some more slices
                 QPieSlice *slice2 = m_series->append("slice 2", 2);
                 QPieSlice *slice4 = m_series->append("slice 4", 4);
                 QCOMPARE(m_series->count(), 3);
                 QCOMPARE(addedSpy.count(), 3);
                 added = qvariant_cast<QList<QPieSlice*> >(addedSpy.at(1).at(0));
                 QCOMPARE(added.count(), 1);
                 QCOMPARE(added.first(), slice2);
                 added = qvariant_cast<QList<QPieSlice*> >(addedSpy.at(2).at(0));
                 QCOMPARE(added.count(), 1);
                 QCOMPARE(added.first(), slice4);
                 // insert between slices
                 QPieSlice *slice3 = new QPieSlice("slice 3", 3);
                 m_series->insert(2, slice3);
                 QCOMPARE(m_series->count(), 4);
                 QCOMPARE(addedSpy.count(), 4);
                 added = qvariant_cast<QList<QPieSlice*> >(addedSpy.at(3).at(0));
                 QCOMPARE(added.count(), 1);
                 QCOMPARE(added.first(), slice3);
                 // check slices
                 for (int i=0; i<m_series->count(); i++) {
                     QCOMPARE(m_series->slices().at(i)->value(), (qreal) i+1);
                     QCOMPARE(m_series->slices().at(i)->label(), QString("slice ") + QString::number(i+1));
                     QVERIFY(m_series->slices().at(i)->parent() == m_series);
                 }
             }
             void tst_qpieseries::insertAnimated()
             {
                 m_view->chart()->setAnimationOptions(QChart::AllAnimations);
                 insert();
             }
             void tst_qpieseries::remove()
             {
                 m_view->chart()->addSeries(m_series);
                 QSignalSpy removedSpy(m_series, SIGNAL(removed(QList<QPieSlice*>)));
                 // add some slices
                 QPieSlice *slice1 = m_series->append("slice 1", 1);
                 QPieSlice *slice2 = m_series->append("slice 2", 2);
                 QPieSlice *slice3 = m_series->append("slice 3", 3);
                 QSignalSpy spy1(slice1, SIGNAL(destroyed()));
                 QSignalSpy spy2(slice2, SIGNAL(destroyed()));
                 QSignalSpy spy3(slice3, SIGNAL(destroyed()));
                 QCOMPARE(m_series->count(), 3);
                 // null pointer remove
                 QVERIFY(!m_series->remove(0));
                 // remove first
                 QVERIFY(m_series->remove(slice1));
                 QVERIFY(!m_series->remove(slice1));
                 QCOMPARE(m_series->count(), 2);
                 QCOMPARE(m_series->slices().at(0)->label(), slice2->label());
                 QCOMPARE(removedSpy.count(), 1);
                 QList<QPieSlice*> removed = qvariant_cast<QList<QPieSlice*> >(removedSpy.at(0).at(0));
                 QCOMPARE(removed.count(), 1);
                 QCOMPARE(removed.first(), slice1);
                 // remove all
                 m_series->clear();
                 QVERIFY(m_series->isEmpty());
                 QVERIFY(m_series->slices().isEmpty());
                 QCOMPARE(m_series->count(), 0);
                 QCOMPARE(removedSpy.count(), 2);
                 removed = qvariant_cast<QList<QPieSlice*> >(removedSpy.at(1).at(0));
                 QCOMPARE(removed.count(), 2);
                 QCOMPARE(removed.first(), slice2);
                 QCOMPARE(removed.last(), slice3);
                 // check that slices were actually destroyed
                 TRY_COMPARE(spy1.count(), 1);
                 TRY_COMPARE(spy2.count(), 1);
                 TRY_COMPARE(spy3.count(), 1);
             }
             void tst_qpieseries::removeAnimated()
             {
                 m_view->chart()->setAnimationOptions(QChart::AllAnimations);
                 remove();
             }
+            void tst_qpieseries::take()
+            {
+                m_view->chart()->addSeries(m_series);
+                QSignalSpy removedSpy(m_series, SIGNAL(removed(QList<QPieSlice*>)));
+                // add some slices
+                QPieSlice *slice1 = m_series->append("slice 1", 1);
+                QPieSlice *slice2 = m_series->append("slice 2", 2);
+                m_series->append("slice 3", 3);
+                QSignalSpy spy1(slice1, SIGNAL(destroyed()));
+                QCOMPARE(m_series->count(), 3);
+                // null pointer remove
+                QVERIFY(!m_series->take(0));
+                // take first
+                QVERIFY(m_series->take(slice1));
+                TRY_COMPARE(spy1.count(), 0);
+                QVERIFY(slice1->parent() == m_series); // series is still the parent object
+                QVERIFY(!m_series->take(slice1));
+                QCOMPARE(m_series->count(), 2);
+                QCOMPARE(m_series->slices().at(0)->label(), slice2->label());
+                QCOMPARE(removedSpy.count(), 1);
+                QList<QPieSlice*> removed = qvariant_cast<QList<QPieSlice*> >(removedSpy.at(0).at(0));
+                QCOMPARE(removed.count(), 1);
+                QCOMPARE(removed.first(), slice1);
+            }
+            void tst_qpieseries::takeAnimated()
+            {
+                m_view->chart()->setAnimationOptions(QChart::AllAnimations);
+                take();
+            }
             void tst_qpieseries::calculatedValues()
             {
                 m_view->chart()->addSeries(m_series);
                 QPieSlice *slice1 = new QPieSlice("slice 1", 1);
                 QSignalSpy percentageSpy(slice1, SIGNAL(percentageChanged()));
                 QSignalSpy startAngleSpy(slice1, SIGNAL(startAngleChanged()));
                 QSignalSpy angleSpanSpy(slice1, SIGNAL(angleSpanChanged()));
                 // add a slice
                 m_series->append(slice1);
                 bool ok;
                 verifyCalculatedData(*m_series, &ok);
                 if (!ok)
                     return;
                 QCOMPARE(percentageSpy.count(), 1);
                 QCOMPARE(startAngleSpy.count(), 0);
                 QCOMPARE(angleSpanSpy.count(), 1);
                 // add some more slices
                 QList<QPieSlice *> list;
                 list << new QPieSlice("slice 2", 2);
                 list << new QPieSlice("slice 3", 3);
                 m_series->append(list);
                 verifyCalculatedData(*m_series, &ok);
                 if (!ok)
                     return;
                 QCOMPARE(percentageSpy.count(), 2);
                 QCOMPARE(startAngleSpy.count(), 0);
                 QCOMPARE(angleSpanSpy.count(), 2);
                 // remove a slice
                 m_series->remove(list.first()); // remove slice 2
                 verifyCalculatedData(*m_series, &ok);
                 if (!ok)
                     return;
                 QCOMPARE(percentageSpy.count(), 3);
                 QCOMPARE(startAngleSpy.count(), 0);
                 QCOMPARE(angleSpanSpy.count(), 3);
                 // insert a slice
                 m_series->insert(0, new QPieSlice("Slice 4", 4));
                 verifyCalculatedData(*m_series, &ok);
                 if (!ok)
                     return;
                 QCOMPARE(percentageSpy.count(), 4);
                 QCOMPARE(startAngleSpy.count(), 1);
                 QCOMPARE(angleSpanSpy.count(), 4);
                 // modify pie angles
                 m_series->setPieStartAngle(-90);
                 m_series->setPieEndAngle(90);
                 verifyCalculatedData(*m_series, &ok);
                 if (!ok)
                     return;
                 QCOMPARE(percentageSpy.count(), 4);
                 QCOMPARE(startAngleSpy.count(), 3);
                 QCOMPARE(angleSpanSpy.count(), 6);
                 // clear all
                 m_series->clear();
                 verifyCalculatedData(*m_series, &ok);
                 if (!ok)
                     return;
                 QCOMPARE(percentageSpy.count(), 4);
                 QCOMPARE(startAngleSpy.count(), 3);
                 QCOMPARE(angleSpanSpy.count(), 6);
             }
             void tst_qpieseries::verifyCalculatedData(const QPieSeries &series, bool *ok)
             {
                 *ok = false;
                 qreal sum = 0;
                 foreach (const QPieSlice *slice, series.slices())
                     sum += slice->value();
                 QCOMPARE(series.sum(), sum);
                 qreal startAngle = series.pieStartAngle();
                 qreal pieAngleSpan = series.pieEndAngle() - series.pieStartAngle();
                 foreach (const QPieSlice *slice, series.slices()) {
                     qreal ratio = slice->value() / sum;
                     qreal sliceSpan = pieAngleSpan * ratio;
                     QCOMPARE(slice->startAngle(), startAngle);
                     QCOMPARE(slice->angleSpan(), sliceSpan);
                     QCOMPARE(slice->percentage(), ratio);
                     startAngle += sliceSpan;
                 }
                 if (!series.isEmpty())
                     QCOMPARE(series.slices().last()->startAngle() + series.slices().last()->angleSpan(), series.pieEndAngle());
                 *ok = true;
             }
             void tst_qpieseries::clickedSignal()
             {
                 // add some slices
                 QPieSlice *s1 = m_series->append("slice 1", 1);
                 QPieSlice *s2 = m_series->append("slice 2", 1);
                 QPieSlice *s3 = m_series->append("slice 3", 1);
                 QPieSlice *s4 = m_series->append("slice 4", 1);
                 QSignalSpy clickSpy(m_series, SIGNAL(clicked(QPieSlice*)));
                 // add series to the chart
                 m_view->chart()->legend()->setVisible(false);
                 m_view->resize(200, 200);
                 m_view->chart()->addSeries(m_series);
                 m_view->show();
                 QTest::qWaitForWindowShown(m_view);
                 // if you devide the chart in four equal tiles these
                 // are the center points of those tiles
                 QPoint p1(90.25, 90);
                 QPoint p2(150, 90);
                 QPoint p3(90, 150);
                 QPoint p4(150, 150);
                 QPoint center(120, 120);
                 m_series->setPieSize(1.0);
                 QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, p1);
                 QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, p2);
                 QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, p3);
                 QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, p4);
                 QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, center);
                 TRY_COMPARE(clickSpy.count(), 5); // all hit
                 QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(0).at(0)), s4);
                 QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(1).at(0)), s1);
                 QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(2).at(0)), s3);
                 QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(3).at(0)), s2);
                 clickSpy.clear();
                 m_series->setPieSize(0.5);
                 m_series->setVerticalPosition(0.25);
                 m_series->setHorizontalPosition(0.25);
                 QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, p1); // hits
                 QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, p2);
                 QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, p3);
                 QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, p4);
                 QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, center);
                 TRY_COMPARE(clickSpy.count(), 1);
                 clickSpy.clear();
                 m_series->setVerticalPosition(0.25);
                 m_series->setHorizontalPosition(0.75);
                 QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, p1);
                 QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, p2); // hits
                 QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, p3);
                 QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, p4);
                 QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, center);
                 TRY_COMPARE(clickSpy.count(), 1);
                 clickSpy.clear();
                 m_series->setVerticalPosition(0.75);
                 m_series->setHorizontalPosition(0.25);
                 QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, p1);
                 QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, p2);
                 QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, p3); // hits
                 QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, p4);
                 QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, center);
                 TRY_COMPARE(clickSpy.count(), 1);
                 clickSpy.clear();
                 m_series->setVerticalPosition(0.75);
                 m_series->setHorizontalPosition(0.75);
                 QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, p1);
                 QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, p2);
                 QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, p3);
                 QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, p4); // hits
                 QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, center);
                 TRY_COMPARE(clickSpy.count(), 1);
                 clickSpy.clear();
             }
             void tst_qpieseries::hoverSignal()
             {
                 // add some slices
                 m_series->setPieSize(1.0);
                 QPieSlice *s1 = m_series->append("slice 1", 1);
                 m_series->append("slice 2", 2);
                 m_series->append("slice 3", 3);
                 // add series to the chart
                 m_view->chart()->legend()->setVisible(false);
                 m_view->resize(200, 200);
                 m_view->chart()->addSeries(m_series);
                 m_view->show();
                 QTest::qWaitForWindowShown(m_view);
                 // first move to right top corner
                 QTest::mouseMove(m_view->viewport(), QPoint(200, 0));
                 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
                 // move inside the slice
                 // pie rectangle: QRectF(60,60 121x121)
                 QSignalSpy hoverSpy(m_series, SIGNAL(hovered(QPieSlice*,bool)));
                 QTest::mouseMove(m_view->viewport(), QPoint(139, 85));
                 TRY_COMPARE(hoverSpy.count(), 1);
                 QCOMPARE(qvariant_cast<QPieSlice*>(hoverSpy.at(0).at(0)), s1);
                 QCOMPARE(qvariant_cast<bool>(hoverSpy.at(0).at(1)), true);
                 // move outside the slice
                 QTest::mouseMove(m_view->viewport(), QPoint(200, 0));
                 TRY_COMPARE(hoverSpy.count(), 2);
                 QCOMPARE(qvariant_cast<QPieSlice*>(hoverSpy.at(1).at(0)), s1);
                 QCOMPARE(qvariant_cast<bool>(hoverSpy.at(1).at(1)), false);
             }
             void tst_qpieseries::sliceSeries()
             {
                 QPieSlice *slice = new QPieSlice();
                 QVERIFY(!slice->series());
                 delete slice;
                 slice = new QPieSlice(m_series);
                 QVERIFY(!slice->series());
                 m_series->append(slice);
                 QCOMPARE(slice->series(), m_series);
                 slice = new QPieSlice();
                 m_series->insert(0, slice);
                 QCOMPARE(slice->series(), m_series);
+                m_series->take(slice);
+                QCOMPARE(slice->series(), (QPieSeries*) 0);
             }
             void tst_qpieseries::destruction()
             {
                 // add some slices
                 QPieSlice *slice1 = m_series->append("slice 1", 1);
                 QPieSlice *slice2 = m_series->append("slice 2", 2);
                 QPieSlice *slice3 = m_series->append("slice 3", 3);
                 QSignalSpy spy1(slice1, SIGNAL(destroyed()));
                 QSignalSpy spy2(slice2, SIGNAL(destroyed()));
                 QSignalSpy spy3(slice3, SIGNAL(destroyed()));
                 // destroy series
                 delete m_series;
                 m_series = 0;
                 // check that series has destroyed its slices
                 QCOMPARE(spy1.count(), 1);
                 QCOMPARE(spy2.count(), 1);
                 QCOMPARE(spy3.count(), 1);
             }
             QTEST_MAIN(tst_qpieseries)
             #include "tst_qpieseries.moc"

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