HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2560:a2f72685ff33

Fix box-and-whiskers animations...

Miikka Heikkinen -

r2560:a2f72685ff33

parent child

Context file:

r2560:a2f72685ff33

Collapse all files

src/animations/boxplotanimation.cpp +8 -1

             /****************************************************************************
             **
             ** Copyright (C) 2013 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 "boxplotanimation_p.h"
             #include "boxplotchartitem_p.h"
             #include "boxwhiskersdata_p.h"
             #include "boxwhiskersanimation_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             BoxPlotAnimation::BoxPlotAnimation(BoxPlotChartItem *item)
-                  : m_item(item)
+                : QObject(item),
+                m_item(item)
             {
             }
             BoxPlotAnimation::~BoxPlotAnimation()
             {
             }
             void BoxPlotAnimation::addBox(BoxWhiskers *box)
             {
                 BoxWhiskersAnimation *animation = m_animations.value(box);
                 if (!animation) {
                     animation = new BoxWhiskersAnimation(box);
                     m_animations.insert(box, animation);
                     BoxWhiskersData start;
                     start.m_median = box->m_data.m_median;
                     animation->setup(start, box->m_data);
                 } else {
                     animation->stop();
                     animation->setEndData(box->m_data);
                 }
             }
             ChartAnimation *BoxPlotAnimation::boxAnimation(BoxWhiskers *box)
             {
                 BoxWhiskersAnimation *animation = m_animations.value(box);
                 if (animation)
                     animation->m_moveMedianLine = false;
                 return animation;
             }
             ChartAnimation *BoxPlotAnimation::boxChangeAnimation(BoxWhiskers *box)
             {
                 BoxWhiskersAnimation *animation = m_animations.value(box);
                 animation->m_moveMedianLine = true;
                 animation->setEndData(box->m_data);
                 return animation;
             }
             void BoxPlotAnimation::setAnimationStart(BoxWhiskers *box)
             {
                 BoxWhiskersAnimation *animation = m_animations.value(box);
                 animation->setStartData(box->m_data);
             }
+            void BoxPlotAnimation::stopAll()
+            {
+                foreach (BoxWhiskersAnimation *animation, m_animations.values())
+                    animation->stopAndDestroyLater();
+            }
             //#include "moc_boxplotanimation_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/animations/boxplotanimation_p.h +3 -1

             /****************************************************************************
             **
             ** Copyright (C) 2013 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$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef BOXPLOTANIMATION_P_H
             #define BOXPLOTANIMATION_P_H
             #include "chartanimation_p.h"
             #include "boxwhiskers_p.h"
             #include "boxwhiskersdata_p.h"
             #include "boxwhiskersanimation_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class BoxPlotChartItem;
-            class BoxPlotAnimation
+            class BoxPlotAnimation : public QObject
             {
+                Q_OBJECT
             public:
                 BoxPlotAnimation(BoxPlotChartItem *item);
                 ~BoxPlotAnimation();
                 void addBox(BoxWhiskers *box);
                 ChartAnimation *boxAnimation(BoxWhiskers *box);
                 ChartAnimation *boxChangeAnimation(BoxWhiskers *box);
                 void setAnimationStart(BoxWhiskers *box);
+                void stopAll();
             protected:
                 BoxPlotChartItem *m_item;
                 QHash<BoxWhiskers *, BoxWhiskersAnimation *> m_animations;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // BOXPLOTANIMATION_P_H

src/animations/boxwhiskersanimation_p.h 0 -2

             /****************************************************************************
             **
             ** Copyright (C) 2013 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$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef BOXWHISKERSANIMATION_P_H
             #define BOXWHISKERSANIMATION_P_H
             #include "chartanimation_p.h"
             #include "boxwhiskers_p.h"
             #include "boxwhiskersdata_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class BoxPlotChartItem;
             class BoxWhiskersAnimation : public ChartAnimation
             {
                 Q_OBJECT
             public:
                 BoxWhiskersAnimation(BoxWhiskers *box);
                 ~BoxWhiskersAnimation();
             public: // from QVariantAnimation
                 virtual QVariant interpolated(const QVariant &from, const QVariant &to, qreal progress) const;
                 virtual void updateCurrentValue(const QVariant &value);
                 void setup(const BoxWhiskersData &startData, const BoxWhiskersData &endData);
                 void setEndData(const BoxWhiskersData &endData);
                 void setStartData(const BoxWhiskersData &endData);
                 void moveMedianLine(bool move);
             protected:
                 friend class BoxPlotAnimation;
-                BoxPlotChartItem *m_item;
                 BoxWhiskers *m_box;
-                BoxWhiskersData *m_boxData;
                 bool m_moveMedianLine;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // BOXWHISKERSANIMATION_P_H

src/boxplotchart/boxplotchartitem.cpp +1 -2

             /****************************************************************************
             **
             ** Copyright (C) 2013 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 "boxplotchartitem_p.h"
             #include "qboxplotseries_p.h"
             #include "bar_p.h"
             #include "qboxset_p.h"
             #include "qabstractbarseries_p.h"
             #include "qboxset.h"
             #include "boxwhiskers_p.h"
             #include <QPainter>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             BoxPlotChartItem::BoxPlotChartItem(QBoxPlotSeries *series, QGraphicsItem *item) :
                 ChartItem(series->d_func(), item),
                 m_series(series),
-                m_animation(0),
+                m_animation(0)
-                m_animate(0)
             {
                 connect(series, SIGNAL(boxsetsRemoved(QList<QBoxSet *>)), this, SLOT(handleBoxsetRemove(QList<QBoxSet *>)));
                 connect(series->d_func(), SIGNAL(restructuredBoxes()), this, SLOT(handleDataStructureChanged()));
                 connect(series->d_func(), SIGNAL(updatedLayout()), this, SLOT(handleLayoutChanged()));
                 connect(series->d_func(), SIGNAL(updatedBoxes()), this, SLOT(handleUpdatedBars()));
                 connect(series->d_func(), SIGNAL(updated()), this, SLOT(handleUpdatedBars()));
                 // QBoxPlotSeriesPrivate calls handleDataStructureChanged(), don't do it here
                 setZValue(ChartPresenter::BoxPlotSeriesZValue);
             }
             BoxPlotChartItem::~BoxPlotChartItem()
             {
             }
             void BoxPlotChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 Q_UNUSED(painter);
                 Q_UNUSED(option);
                 Q_UNUSED(widget);
             }
             void BoxPlotChartItem::setAnimation(BoxPlotAnimation *animation)
             {
                 m_animation = animation;
                 if (m_animation) {
                     foreach (BoxWhiskers *item, m_boxTable.values())
                         m_animation->addBox(item);
                     handleDomainUpdated();
                 }
             }
             void BoxPlotChartItem::handleDataStructureChanged()
             {
                 int setCount = m_series->count();
                 for (int s = 0; s < setCount; s++) {
                     QBoxSet *set = m_series->d_func()->boxSetAt(s);
                     BoxWhiskers *box = m_boxTable.value(set);
                     if (!box) {
                         // Item is not yet created, make a box and add it to hash table
                         box = new BoxWhiskers(set, domain(), this);
                         m_boxTable.insert(set, box);
                         connect(box, SIGNAL(clicked(QBoxSet *)), m_series, SIGNAL(clicked(QBoxSet *)));
                         connect(box, SIGNAL(hovered(bool, QBoxSet *)), m_series, SIGNAL(hovered(bool, QBoxSet *)));
                         connect(box, SIGNAL(clicked(QBoxSet *)), set, SIGNAL(clicked()));
                         connect(box, SIGNAL(hovered(bool, QBoxSet *)), set, SIGNAL(hovered(bool)));
                         // Set the decorative issues for the newly created box
                         box->setBrush(m_series->brush());
                         box->setPen(m_series->pen());
                     }
                     updateBoxGeometry(box, s);
                     box->updateGeometry(domain());
                     if (m_animation)
                         m_animation->addBox(box);
                 }
                 handleDomainUpdated();
             }
             void BoxPlotChartItem::handleUpdatedBars()
             {
                 foreach (BoxWhiskers *item, m_boxTable.values()) {
                     item->setBrush(m_series->brush());
                     item->setPen(m_series->pen());
                 }
                 // Override with QBoxSet specific settings
                 foreach (QBoxSet *set, m_boxTable.keys()) {
                     if (set->brush().style() != Qt::NoBrush)
                         m_boxTable.value(set)->setBrush(set->brush());
                     if (set->pen().style() != Qt::NoPen)
                         m_boxTable.value(set)->setPen(set->pen());
                 }
             }
             void BoxPlotChartItem::handleBoxsetRemove(QList<QBoxSet*> barSets)
             {
                 foreach (QBoxSet *set, barSets) {
                     BoxWhiskers *boxItem = m_boxTable.value(set);
                     m_boxTable.remove(set);
                     delete boxItem;
                 }
             }
             void BoxPlotChartItem::handleDomainUpdated()
             {
                 if ((domain()->size().width() <= 0) || (domain()->size().height() <= 0))
                     return;
                 // Set my bounding rect to same as domain size. Add one pixel at the top (-1.0) and the bottom as 0.0 would
                 // snip a bit off from the whisker at the grid line
                 m_boundingRect.setRect(0.0, -1.0, domain()->size().width(), domain()->size().height() + 1.0);
                 foreach (BoxWhiskers *item, m_boxTable.values()) {
                     item->updateGeometry(domain());
                     // If the animation is set, start the animation for each BoxWhisker item
                     if (m_animation)
                         presenter()->startAnimation(m_animation->boxAnimation(item));
                 }
             }
             void BoxPlotChartItem::handleLayoutChanged()
             {
                 foreach (BoxWhiskers *item, m_boxTable.values()) {
                     if (m_animation)
                         m_animation->setAnimationStart(item);
                     bool dirty = updateBoxGeometry(item, item->m_data.m_index);
                     if (dirty && m_animation)
                         presenter()->startAnimation(m_animation->boxChangeAnimation(item));
                     else
                         item->updateGeometry(domain());
                 }
             }
             QRectF BoxPlotChartItem::boundingRect() const
             {
                 return m_boundingRect;
             }
             void BoxPlotChartItem::initializeLayout()
             {
             }
             QVector<QRectF> BoxPlotChartItem::calculateLayout()
             {
                 return QVector<QRectF>();
             }
             bool BoxPlotChartItem::updateBoxGeometry(BoxWhiskers *box, int index)
             {
                 bool changed = false;
                 QBoxSet *set = m_series->d_func()->boxSetAt(index);
                 BoxWhiskersData &data = box->m_data;
                 if ((data.m_lowerExtreme != set->at(0)) || (data.m_lowerQuartile != set->at(1)) ||
                     (data.m_median != set->at(2)) || (data.m_upperQuartile != set->at(3)) || (data.m_upperExtreme != set->at(4))) {
                     changed = true;
                 }
                 data.m_lowerExtreme = set->at(0);
                 data.m_lowerQuartile = set->at(1);
                 data.m_median = set->at(2);
                 data.m_upperQuartile = set->at(3);
                 data.m_upperExtreme = set->at(4);
                 data.m_index = index;
                 data.m_boxItems = m_series->count();
                 data.m_maxX = domain()->maxX();
                 data.m_minX = domain()->minX();
                 data.m_maxY = domain()->maxY();
                 data.m_minY = domain()->minY();
                 data.m_seriesIndex = m_seriesIndex;
                 data.m_seriesCount = m_seriesCount;
                 return changed;
             }
             #include "moc_boxplotchartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/boxplotchart/boxplotchartitem_p.h 0 -1

             /****************************************************************************
             **
             ** Copyright (C) 2013 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$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef BOXPLOTCHARTITEM_H
             #define BOXPLOTCHARTITEM_H
             #include "boxwhiskers_p.h"
             #include "qboxplotseries.h"
             #include "chartitem_p.h"
             #include "boxplotanimation_p.h"
             #include "qboxset.h"
             #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class BoxPlotSeriesPrivate;
             class BoxPlotChartItem : public ChartItem
             {
                 Q_OBJECT
             public:
                 BoxPlotChartItem(QBoxPlotSeries *series, QGraphicsItem *item = 0);
                 ~BoxPlotChartItem();
                 void setAnimation(BoxPlotAnimation *animation);
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
                 QRectF boundingRect() const;
             public Q_SLOTS:
                 void handleDataStructureChanged();
                 void handleDomainUpdated();
                 void handleLayoutChanged();
                 void handleUpdatedBars();
                 void handleBoxsetRemove(QList<QBoxSet *> barSets);
             private:
                 virtual QVector<QRectF> calculateLayout();
                 void initializeLayout();
                 bool updateBoxGeometry(BoxWhiskers *box, int index);
             protected:
                 friend class QBoxPlotSeriesPrivate;
                 QBoxPlotSeries *m_series; // Not owned.
                 QList<BoxWhiskers *> m_boxes;
                 QHash<QBoxSet *, BoxWhiskers *> m_boxTable;
                 int m_seriesIndex;
                 int m_seriesCount;
                 BoxPlotAnimation *m_animation;
-                bool m_animate;
                 QRectF m_boundingRect;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // BOXPLOTCHARTITEM_H

src/boxplotchart/qboxplotseries.cpp +9 -3

             /****************************************************************************
             **
             ** Copyright (C) 2013 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 "qboxplotseries.h"
             #include "qboxplotseries_p.h"
             #include "qboxplotlegendmarker.h"
             #include "qbarcategoryaxis.h"
             #include "boxplotchartitem_p.h"
             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             #include "qvalueaxis.h"
             #include "charttheme_p.h"
             #include "boxplotanimation_p.h"
             #include "qchart_p.h"
             #include "qboxset.h"
             #include "qboxset_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \class QBoxPlotSeries
                 \brief Series for creating box-and-whiskers chart
                 \mainclass
                 QBoxPlotSeries represents a series of data shown as box-and-whisker bars. The purpose of this class is to act as
                 a container for single box-and-whisker items. Each item is drawn to own slot. If chart includes multiple instances of
                 QBoxPlotSeries then box-and-whiskers items with the same index are drawn to same slot.
                 See the \l {Box and Whiskers Example} {box-and-whiskers chart example} to learn how to create a box-and-whiskers chart.
                 \image examples_boxplotchart.png
                 \sa QBoxSet
             */
             /*!
                 \qmlclass BoxPlotSeries QBoxPlotSeries
                 \inherits QAbstractSeries
                 BoxPlotSeries represents a series of data shown as box-and-whisker bars. The purpose of this class is to act as
                 a container for single box-and-whisker items. Each item is drawn to own slot. If chart includes multiple instances of
                 BoxPlotSeries then box-and-whiskers items with the same index are drawn to same slot.
                 The following QML shows how to create a simple box-and-whiskers chart:
                 \code
                 import QtQuick 1.0
                 import QtCommercial.Chart 1.1
                 ChartView {
                     title: "Box Plot series"
                     width: 400
                     height: 300
                     theme: ChartView.ChartThemeBrownSand
                     legend.alignment: Qt.AlignBottom
                     BoxPlotSeries {
                         id: plotSeries
                         name: "Income"
                         BoxSet { label: "Jan"; values: [3, 4, 5.1, 6.2, 8.5] }
                         BoxSet { label: "Feb"; values: [5, 6, 7.5, 8.6, 11.8] }
                         BoxSet { label: "Mar"; values: [3.2, 5, 5.7, 8, 9.2] }
                         BoxSet { label: "Apr"; values: [3.8, 5, 6.4, 7, 8] }
                         BoxSet { label: "May"; values: [4, 5, 5.2, 6, 7] }
                     }
                 }
                 \endcode
                 \beginfloatleft
                 \image examples_qmlboxplot.png
                 \endfloat
                 \clearfloat
             */
             /*!
                 \fn QBoxPlotSeries::boxsetsAdded(QList<QBoxSet *> sets)
                 \brief Signal is emitted when a new \a sets of box-and-whiskers data is added to the series.
             */
             /*!
                 \fn QBoxPlotSeries::boxsetsRemoved(QList<QBoxSet *> sets)
                 \brief Signal is emitted when \a sets of box-and-whiskers data is removed from the series.
             */
             /*!
                 \fn QBoxPlotSeries::clicked(QBoxSet *boxset)
                 \brief Signal is emitted when the user clicks the \a boxset on the chart.
             */
             /*!
                 \fn QBoxPlotSeries::hovered(bool status, QBoxSet *boxset)
                 \brief Signal is emitted when there is change in hover \a status over \a boxset.
             */
             /*!
                 \fn QBoxPlotSeries::countChanged()
                 \brief Signal is emitted when there is change in count of box-and-whiskers items in the series.
             */
             /*!
                 \fn virtual SeriesType QBoxPlotSeries::type() const
                 \brief Returns type of series.
                 \sa QAbstractSeries, SeriesType
             */
             /*!
                 \qmlmethod BoxPlotSeries::append(const QString label, QVariantList values)
                 Appends a new box-and-whiskers set with \a label and \a values to the series.
              */
             /*!
                 \qmlmethod BoxPlotSeries::append(BoxSet *box)
                 Appends the \a box to the series.
             */
             /*!
                 \qmlmethod BoxPlotSeries::insert(int index, const QString label, QVariantList values)
                 Inserts a new box-and-whiskers set with \a label and \a values at the \a index position.
             */
             /*!
                 \qmlmethod BoxPlotSeries::remove(QBoxSet *boxset)
                 Removes the \a boxset from the series.
             */
             /*!
                 \qmlmethod BoxPlotSeries::clear()
                 Removes all boxsets from the series. Deletes removed sets.
             */
             /*!
                 \qmlsignal BoxPlotSeries::onClicked(BoxSet boxset);
                 Signal is emitted when the user clicks the \a boxset on the chart.
             */
             /*!
                 \qmlsignal BoxPlotSeries::onHovered(bool status, BoxSet boxset);
                 Signal is emitted when there is change in hover \a status over \a boxset.
             */
             /*!
                 \qmlsignal BoxPlotSeries::onCountChanged();
                 Signal is emitted when there is change in count of box-and-whiskers items in the series.
             */
             /*!
                 \qmlsignal BoxPlotSeries::onBoxsetsAdded()
                 Signal is emitted when new box-and-whiskers sets are added to the series.
              */
             /*!
                 \qmlsignal BoxPlotSeries::boxsetsRemoved()
                 Signal is emitted when new box-and-whiskers sets are removed from the series.
              */
             /*!
                 Constructs empty QBoxPlotSeries.
                 QBoxPlotSeries is QObject which is a child of a \a parent.
             */
             QBoxPlotSeries::QBoxPlotSeries(QObject *parent)
                 : QAbstractSeries(*new QBoxPlotSeriesPrivate(this), parent)
             {
             }
             /*!
                 Destructor. Removes series from chart.
             */
             QBoxPlotSeries::~QBoxPlotSeries()
             {
                 Q_D(QBoxPlotSeries);
                 if (d->m_chart)
                     d->m_chart->removeSeries(this);
             }
             /*!
                 Adds a single box and whiskers set to series. Takes ownership of the \a set. If the set is null or is already in series, it won't be appended.
                 Returns true, if appending succeeded.
             */
             bool QBoxPlotSeries::append(QBoxSet *set)
             {
                 Q_D(QBoxPlotSeries);
                 bool success = d->append(set);
                 if (success) {
                     QList<QBoxSet *> sets;
                     sets.append(set);
                     set->setParent(this);
                     emit boxsetsAdded(sets);
                     emit countChanged();
                 }
                 return success;
             }
             /*!
                 Removes boxset from the series. Deletes the \a set and returns true if successful.
             */
             bool QBoxPlotSeries::remove(QBoxSet *set)
             {
                 Q_D(QBoxPlotSeries);
                 bool success = d->remove(set);
                 if (success) {
                     QList<QBoxSet *> sets;
                     sets.append(set);
                     set->setParent(0);
                     emit boxsetsRemoved(sets);
                     emit countChanged();
                     delete set;
                     set = 0;
                 }
                 return success;
             }
             /*!
                 Takes a single \a set from the series. Does not delete the boxset object.
                 NOTE: The series remains as the boxset's parent object. You must set the
                 parent object to take full ownership.
                 Returns true if take was successful.
             */
             bool QBoxPlotSeries::take(QBoxSet *set)
             {
                 Q_D(QBoxPlotSeries);
                 bool success = d->remove(set);
                 if (success) {
                     QList<QBoxSet *> sets;
                     sets.append(set);
                     emit boxsetsRemoved(sets);
                     emit countChanged();
                 }
                 return success;
             }
             /*!
                 Adds a list of boxsets to series. Takes ownership of the \a sets.
                 Returns true, if all sets were appended successfully. If any of the sets is null or is already appended to series,
                 nothing is appended and function returns false. If any of the sets is in list more than once, nothing is appended
                 and function returns false.
             */
             bool QBoxPlotSeries::append(QList<QBoxSet *> sets)
             {
                 Q_D(QBoxPlotSeries);
                 bool success = d->append(sets);
                 if (success) {
                     emit boxsetsAdded(sets);
                     emit countChanged();
                 }
                 return success;
             }
             /*!
                 Insert a box-and-whiskers set to the series at \a index postion. Takes ownership of the \a set. If the set is null or
                 is already in series, it won't be appended. Returns true, if inserting succeeded.
             */
             bool QBoxPlotSeries::insert(int index, QBoxSet *set)
             {
                 Q_D(QBoxPlotSeries);
                 bool success = d->insert(index, set);
                 if (success) {
                     QList<QBoxSet *> sets;
                     sets.append(set);
                     emit boxsetsAdded(sets);
                     emit countChanged();
                 }
                 return success;
             }
             /*!
                 Removes all boxsets from the series. Deletes removed sets.
             */
             void QBoxPlotSeries::clear()
             {
                 Q_D(QBoxPlotSeries);
                 QList<QBoxSet *> sets = boxSets();
                 bool success = d->remove(sets);
                 if (success) {
                     emit boxsetsRemoved(sets);
                     emit countChanged();
                     foreach (QBoxSet *set, sets)
                         delete set;
                 }
             }
             /*!
                 Returns number of sets in series.
             */
             int QBoxPlotSeries::count() const
             {
                 Q_D(const QBoxPlotSeries);
                 return d->m_boxSets.count();
             }
             /*!
                 Returns a list of sets in series. Keeps ownership of sets.
              */
             QList<QBoxSet *> QBoxPlotSeries::boxSets() const
             {
                 Q_D(const QBoxPlotSeries);
                 return d->m_boxSets;
             }
             /*
                 Returns QAbstractSeries::SeriesTypeBoxPlot.
             */
             QAbstractSeries::SeriesType QBoxPlotSeries::type() const
             {
                 return QAbstractSeries::SeriesTypeBoxPlot;
             }
             /*!
                 Sets brush for the series. Box-and-whiskers items are drawn using \a brush
             */
             void QBoxPlotSeries::setBrush(const QBrush &brush)
             {
                 Q_D(QBoxPlotSeries);
                 if (d->m_brush != brush) {
                     d->m_brush = brush;
                     emit d->updated();
                 }
             }
             /*!
                 Returns brush of the series.
             */
             QBrush QBoxPlotSeries::brush() const
             {
                 Q_D(const QBoxPlotSeries);
                 return d->m_brush;
             }
             /*!
                 Sets pen for the series. Box-and-whiskers items are drawn using \a pen
             */
             void QBoxPlotSeries::setPen(const QPen &pen)
             {
                 Q_D(QBoxPlotSeries);
                 if (d->m_pen != pen) {
                     d->m_pen = pen;
                     emit d->updated();
                 }
             }
             /*!
                 Returns the pen of this series.
             */
             QPen QBoxPlotSeries::pen() const
             {
                 Q_D(const QBoxPlotSeries);
                 return d->m_pen;
             }
             ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QBoxPlotSeriesPrivate::QBoxPlotSeriesPrivate(QBoxPlotSeries *q)
                 : QAbstractSeriesPrivate(q),
                   m_pen(QChartPrivate::defaultPen()),
                   m_brush(QChartPrivate::defaultBrush())
             {
             }
             QBoxPlotSeriesPrivate::~QBoxPlotSeriesPrivate()
             {
                 disconnect(this, 0, 0, 0);
             }
             void QBoxPlotSeriesPrivate::initializeDomain()
             {
                 qreal minX(domain()->minX());
                 qreal minY(domain()->minY());
                 qreal maxX(domain()->maxX());
                 qreal maxY(domain()->maxY());
                 qreal x = m_boxSets.count();
                 minX = qMin(minX, qreal(-0.5));
                 minY = qMin(minY, min());
                 maxX = qMax(maxX, x - qreal(0.5));
                 maxY = qMax(maxY, max());
                 domain()->setRange(minX, maxX, minY, maxY);
             }
             void QBoxPlotSeriesPrivate::initializeAxes()
             {
                 foreach (QAbstractAxis* axis, m_axes) {
                     if (axis->type() == QAbstractAxis::AxisTypeBarCategory) {
                         if (axis->orientation() == Qt::Horizontal)
                             populateCategories(qobject_cast<QBarCategoryAxis *>(axis));
                     }
                 }
             }
             QAbstractAxis::AxisType QBoxPlotSeriesPrivate::defaultAxisType(Qt::Orientation orientation) const
             {
                 if (orientation == Qt::Horizontal)
                     return QAbstractAxis::AxisTypeBarCategory;
                 return QAbstractAxis::AxisTypeValue;
             }
             QAbstractAxis* QBoxPlotSeriesPrivate::createDefaultAxis(Qt::Orientation orientation) const
             {
                 Q_UNUSED(orientation);
                 return 0;
             }
             void QBoxPlotSeriesPrivate::populateCategories(QBarCategoryAxis *axis)
             {
                 QStringList categories;
                 if (axis->categories().isEmpty()) {
                     for (int i(1); i < m_boxSets.count() + 1; i++) {
                         QBoxSet *set = m_boxSets.at(i - 1);
                         if (set->label().isEmpty())
                             categories << QString::number(i);
                         else
                             categories << set->label();
                     }
                     axis->append(categories);
                 }
             }
             void QBoxPlotSeriesPrivate::initializeGraphics(QGraphicsItem *parent)
             {
                 Q_Q(QBoxPlotSeries);
                 BoxPlotChartItem *boxPlot = new BoxPlotChartItem(q, parent);
                 m_item.reset(boxPlot);
                 QAbstractSeriesPrivate::initializeGraphics(parent);
                 if (m_chart) {
                     connect(m_chart->d_ptr->m_dataset, SIGNAL(seriesAdded(QAbstractSeries*)), this, SLOT(handleSeriesChange(QAbstractSeries*)) );
                     connect(m_chart->d_ptr->m_dataset, SIGNAL(seriesRemoved(QAbstractSeries*)), this, SLOT(handleSeriesRemove(QAbstractSeries*)) );
                     QList<QAbstractSeries *> serieses = m_chart->series();
                     // Tries to find this series from the Chart's list of series and deduce the index
                     int index = 0;
                     foreach (QAbstractSeries *s, serieses) {
                         if (s->type() == QAbstractSeries::SeriesTypeBoxPlot) {
                             if (q == static_cast<QBoxPlotSeries *>(s)) {
                                 boxPlot->m_seriesIndex = index;
                                 m_index = index;
                             }
                             index++;
                         }
                     }
                     boxPlot->m_seriesCount = index;
                 }
                 // Make BoxPlotChartItem to instantiate box & whisker items
                 boxPlot->handleDataStructureChanged();
             }
             void QBoxPlotSeriesPrivate::initializeTheme(int index, ChartTheme* theme, bool forced)
             {
                 Q_Q(QBoxPlotSeries);
                 const QList<QGradient> gradients = theme->seriesGradients();
                 if (forced || QChartPrivate::defaultBrush() == m_brush) {
                     QColor brushColor = ChartThemeManager::colorAt(gradients.at(index % gradients.size()), 0.5);
                     q->setBrush(brushColor);
                 }
                 if (forced || QChartPrivate::defaultPen() == m_pen) {
                     QPen pen = theme->outlinePen();
                     pen.setCosmetic(true);
                     q->setPen(pen);
                 }
             }
             void QBoxPlotSeriesPrivate::initializeAnimations(QChart::AnimationOptions options)
             {
                 BoxPlotChartItem *item = static_cast<BoxPlotChartItem *>(m_item.data());
                 Q_ASSERT(item);
                 if (item->animation())
                     item->animation()->stopAndDestroyLater();
                 if (options.testFlag(QChart::SeriesAnimations))
-                    item->setAnimation(new BoxPlotAnimation(item));
+                    m_animation = new BoxPlotAnimation(item);
                 else
-                    item->setAnimation(0);
+                    m_animation = 0;
+                item->setAnimation(m_animation);
                 QAbstractSeriesPrivate::initializeAnimations(options);
             }
             QList<QLegendMarker*> QBoxPlotSeriesPrivate::createLegendMarkers(QLegend *legend)
             {
                 Q_Q(QBoxPlotSeries);
                 QList<QLegendMarker *> list;
                 return list << new QBoxPlotLegendMarker(q, legend);
             }
             void QBoxPlotSeriesPrivate::handleSeriesRemove(QAbstractSeries *series)
             {
                 Q_Q(QBoxPlotSeries);
                 QBoxPlotSeries *removedSeries = static_cast<QBoxPlotSeries *>(series);
-                QObject::disconnect(m_chart->d_ptr->m_dataset, 0, removedSeries->d_func(), 0);
+                if (q == removedSeries && m_animation) {
+                    m_animation->stopAll();
+                    QObject::disconnect(m_chart->d_ptr->m_dataset, 0, removedSeries->d_func(), 0);
+                }
                 // Test if series removed is me, then don't do anything
                 if (q != removedSeries) {
                     BoxPlotChartItem *item = static_cast<BoxPlotChartItem *>(m_item.data());
                     if (item) {
                         item->m_seriesCount = item->m_seriesCount - 1;
                         if (removedSeries->d_func()->m_index < m_index) {
                             m_index--;
                             item->m_seriesIndex = m_index;
                         }
                         item->handleDataStructureChanged();
                     }
                 }
             }
             void QBoxPlotSeriesPrivate::handleSeriesChange(QAbstractSeries *series)
             {
                 Q_UNUSED(series);
                 Q_Q(QBoxPlotSeries);
                 BoxPlotChartItem *boxPlot = static_cast<BoxPlotChartItem *>(m_item.data());
                 if (m_chart) {
                     QList<QAbstractSeries *> serieses = m_chart->series();
                     // Tries to find this series from the Chart's list of series and deduce the index
                     int index = 0;
                     foreach (QAbstractSeries *s, serieses) {
                         if (s->type() == QAbstractSeries::SeriesTypeBoxPlot) {
                             if (q == static_cast<QBoxPlotSeries *>(s)) {
                                 boxPlot->m_seriesIndex = index;
                                 m_index = index;
                             }
                             index++;
                         }
                     }
                     boxPlot->m_seriesCount = index;
                 }
                 boxPlot->handleDataStructureChanged();
             }
             bool QBoxPlotSeriesPrivate::append(QBoxSet *set)
             {
                 if ((m_boxSets.contains(set)) || (set == 0))
                     return false; // Fail if set is already in list or set is null.
                 m_boxSets.append(set);
                 QObject::connect(set->d_ptr.data(), SIGNAL(updatedLayout()), this, SIGNAL(updatedLayout()));
                 QObject::connect(set->d_ptr.data(), SIGNAL(updatedBox()), this, SIGNAL(updatedBoxes()));
                 QObject::connect(set->d_ptr.data(), SIGNAL(restructuredBox()), this, SIGNAL(restructuredBoxes()));
                 emit restructuredBoxes(); // this notifies boxplotchartitem
                 return true;
             }
             bool QBoxPlotSeriesPrivate::remove(QBoxSet *set)
             {
                 if (!m_boxSets.contains(set))
                     return false; // Fail if set is not in list
                 m_boxSets.removeOne(set);
                 QObject::disconnect(set->d_ptr.data(), SIGNAL(updatedLayout()), this, SIGNAL(updatedLayout()));
                 QObject::disconnect(set->d_ptr.data(), SIGNAL(updatedBox()), this, SIGNAL(updatedBoxes()));
                 QObject::disconnect(set->d_ptr.data(), SIGNAL(restructuredBox()), this, SIGNAL(restructuredBoxes()));
                 emit restructuredBoxes(); // this notifies boxplotchartitem
                 return true;
             }
             bool QBoxPlotSeriesPrivate::append(QList<QBoxSet *> sets)
             {
                 foreach (QBoxSet *set, sets) {
                     if ((set == 0) || (m_boxSets.contains(set)))
                         return false; // Fail if any of the sets is null or is already appended.
                     if (sets.count(set) != 1)
                         return false; // Also fail if same set is more than once in given list.
                 }
                 foreach (QBoxSet *set, sets) {
                     m_boxSets.append(set);
                     QObject::connect(set->d_ptr.data(), SIGNAL(updatedLayout()), this, SIGNAL(updatedLayout()));
                     QObject::connect(set->d_ptr.data(), SIGNAL(updatedBox()), this, SIGNAL(updatedBoxes()));
                     QObject::connect(set->d_ptr.data(), SIGNAL(restructuredBox()), this, SIGNAL(restructuredBoxes()));
                 }
                 emit restructuredBoxes(); // this notifies boxplotchartitem
                 return true;
             }
             bool QBoxPlotSeriesPrivate::remove(QList<QBoxSet *> sets)
             {
                 if (sets.count() == 0)
                     return false;
                 foreach (QBoxSet *set, sets) {
                     if ((set == 0) || (!m_boxSets.contains(set)))
                         return false; // Fail if any of the sets is null or is not in series
                     if (sets.count(set) != 1)
                         return false; // Also fail if same set is more than once in given list.
                 }
                 foreach (QBoxSet *set, sets) {
                     m_boxSets.removeOne(set);
                     QObject::disconnect(set->d_ptr.data(), SIGNAL(updatedLayout()), this, SIGNAL(updatedLayout()));
                     QObject::disconnect(set->d_ptr.data(), SIGNAL(updatedBox()), this, SIGNAL(updatedBoxes()));
                     QObject::disconnect(set->d_ptr.data(), SIGNAL(restructuredBox()), this, SIGNAL(restructuredBoxes()));
                 }
                 emit restructuredBoxes();        // this notifies boxplotchartitem
                 return true;
             }
             bool QBoxPlotSeriesPrivate::insert(int index, QBoxSet *set)
             {
                 if ((m_boxSets.contains(set)) || (set == 0))
                     return false; // Fail if set is already in list or set is null.
                 m_boxSets.insert(index, set);
                 QObject::connect(set->d_ptr.data(), SIGNAL(updatedLayout()), this, SIGNAL(updatedLayout()));
                 QObject::connect(set->d_ptr.data(), SIGNAL(updatedBox()), this, SIGNAL(updatedBoxes()));
                 QObject::connect(set->d_ptr.data(), SIGNAL(restructuredBox()), this, SIGNAL(restructuredBoxes()));
                 emit restructuredBoxes();      // this notifies boxplotchartitem
                 return true;
             }
             QBoxSet *QBoxPlotSeriesPrivate::boxSetAt(int index)
             {
                 return m_boxSets.at(index);
             }
             qreal QBoxPlotSeriesPrivate::min()
             {
                 if (m_boxSets.count() <= 0)
                     return 0;
                 qreal min = m_boxSets.at(0)->at(0);
                 foreach (QBoxSet *set, m_boxSets) {
                     for (int i = 0; i < 5; i++) {
                         if (set->at(i) < min)
                             min = set->at(i);
                     }
                 }
                 return min;
             }
             qreal QBoxPlotSeriesPrivate::max()
             {
                 if (m_boxSets.count() <= 0)
                     return 0;
                 qreal max = m_boxSets.at(0)->at(0);
                 foreach (QBoxSet *set, m_boxSets) {
                     for (int i = 0; i < 5; i++) {
                         if (set->at(i) > max)
                             max = set->at(i);
                     }
                 }
                 return max;
             }
             #include "moc_qboxplotseries.cpp"
             #include "moc_qboxplotseries_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/boxplotchart/qboxplotseries_p.h +3 0

             /****************************************************************************
             **
             ** Copyright (C) 2013 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$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef QBOXPLOTSERIES_P_H
             #define QBOXPLOTSERIES_P_H
             #include "qboxplotseries.h"
             #include "qabstractbarseries_p.h"
             #include "abstractdomain_p.h"
             #include "qbarset.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
+            class BoxPlotAnimation;
             class QBoxPlotSeriesPrivate : public QAbstractSeriesPrivate
             {
                 Q_OBJECT
             public:
                 QBoxPlotSeriesPrivate(QBoxPlotSeries *q);
                 ~QBoxPlotSeriesPrivate();
                 void initializeGraphics(QGraphicsItem *parent);
                 void initializeDomain();
                 void initializeAxes();
                 void initializeAnimations(QChart::AnimationOptions options);
                 void initializeTheme(int index, ChartTheme *theme, bool forced = false);
                 QList<QLegendMarker*> createLegendMarkers(QLegend *legend);
                 virtual QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const;
                 QAbstractAxis *createDefaultAxis(Qt::Orientation orientation) const;
                 bool append(QBoxSet *set);
                 bool remove(QBoxSet *set);
                 bool append(QList<QBoxSet *> sets);
                 bool remove(QList<QBoxSet *> sets);
                 bool insert(int index, QBoxSet *set);
                 QBoxSet *boxSetAt(int index);
                 qreal max();
                 qreal min();
             private:
                 void populateCategories(QBarCategoryAxis *axis);
             Q_SIGNALS:
                 void updated();
                 void clicked(int index, QBoxSet *barset);
                 void updatedBoxes();
                 void updatedLayout();
                 void restructuredBoxes();
             private slots:
                 void handleSeriesChange(QAbstractSeries *series);
                 void handleSeriesRemove(QAbstractSeries *series);
             protected:
                 QList<QBoxSet *> m_boxSets;
                 QPen m_pen;
                 QBrush m_brush;
                 int m_index;
+                BoxPlotAnimation *m_animation;
             private:
                 Q_DECLARE_PUBLIC(QBoxPlotSeries)
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

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