HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2478:5245fa8e4b16

Fixed animation to work when adding a new series....

Mika Salmela -

r2478:5245fa8e4b16

parent child

Context file:

r2478:5245fa8e4b16

Collapse all files

src/animations/boxplotanimation.cpp +12 -14

             /****************************************************************************
             **
             ** 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"
+            #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             BoxPlotAnimation::BoxPlotAnimation(BoxPlotChartItem *item)
-               // : ChartAnimation(item),
                   : m_item(item)
             {
             }
-            //BoxPlotAnimation::BoxPlotAnimation(BoxWhiskers *box)
-            //    : ChartAnimation(box),
-            //      m_box(box)
-            //{
-            //}
             BoxPlotAnimation::~BoxPlotAnimation()
             {
             }
             void BoxPlotAnimation::addBox(BoxWhiskers *box)
             {
-                BoxWhiskersAnimation *animation = new BoxWhiskersAnimation(box);
+                BoxWhiskersAnimation *animation = m_animations.value(box);
-                m_animations.insert(box, animation);
+                if (!animation) {
+                    animation = new BoxWhiskersAnimation(box);
-                BoxWhiskersData start;
+                    m_animations.insert(box, animation);
-                start.m_median = box->m_data.m_median;
+                    BoxWhiskersData start;
-                animation->setup(start, box->m_data);
+                    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)
             {
                 // TODO: Check for missing animation
                 return m_animations.value(box);
             }
             //#include "moc_boxplotanimation_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/animations/boxwhiskersanimation.cpp +11 -4

             /****************************************************************************
             **
             ** 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 "boxwhiskersanimation_p.h"
             #include "boxplotanimation_p.h"
             #include "boxplotchartitem_p.h"
             #include "boxwhiskersdata_p.h"
+            #include <QDebug>
             Q_DECLARE_METATYPE(QVector<QRectF>)
             Q_DECLARE_METATYPE(QTCOMMERCIALCHART_NAMESPACE::BoxWhiskersData)
             Q_DECLARE_METATYPE(qreal)
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             BoxWhiskersAnimation::BoxWhiskersAnimation(BoxPlotChartItem *item)
                 : ChartAnimation(item),
                   m_item(item)
             {
                 setDuration(ChartAnimationDuration);
                 setEasingCurve(QEasingCurve::OutQuart);
             }
             BoxWhiskersAnimation::BoxWhiskersAnimation(BoxWhiskers *box)
                 : ChartAnimation(box),
                   m_box(box)
             {
                 setDuration(ChartAnimationDuration);
                 setEasingCurve(QEasingCurve::OutQuart);
             }
             BoxWhiskersAnimation::~BoxWhiskersAnimation()
             {
             }
             QVariant BoxWhiskersAnimation::interpolated(const QVariant &from, const QVariant &to, qreal progress) const
             {
                 BoxWhiskersData startData = qvariant_cast<BoxWhiskersData>(from);
                 BoxWhiskersData endData = qvariant_cast<BoxWhiskersData>(to);
                 BoxWhiskersData result;
                 if (endData.m_index == 1) {
                     //qDebug() << "endData.m_lowerExtreme = " << endData.m_lowerExtreme;
                     //qDebug() << "endData.m_median = " << endData.m_median;
                 }
                 result.m_lowerExtreme = endData.m_median + progress * (endData.m_lowerExtreme - endData.m_median);
                 result.m_lowerQuartile = endData.m_median + progress * (endData.m_lowerQuartile - endData.m_median);
                 result.m_median = endData.m_median;
                 result.m_upperQuartile = endData.m_median + progress * (endData.m_upperQuartile - endData.m_median);
                 result.m_upperExtreme = endData.m_median + progress * (endData.m_upperExtreme - endData.m_median);
                 result.m_index = endData.m_index;
                 result.m_boxItems = endData.m_boxItems;
             //    result.m_lowerExtreme = endData.m_lowerExtreme;
             //    result.m_lowerQuartile = endData.m_lowerQuartile;
             //    result.m_median = endData.m_median;
             //    result.m_upperQuartile = endData.m_upperQuartile;
             //    result.m_upperExtreme = endData.m_upperExtreme;
             //    result.m_index = endData.m_index;
             //    result.m_boxItems = endData.m_boxItems;
                 result.m_maxX = endData.m_maxX;
                 result.m_minX = endData.m_minX;
                 result.m_maxY = endData.m_maxY;
                 result.m_minY = endData.m_minY;
-                //result.m_domainSize = endData.m_domainSize;
+                result.m_seriesIndex = endData.m_seriesIndex;
+                result.m_seriesCount = endData.m_seriesCount;
                 return qVariantFromValue(result);
             }
             void BoxWhiskersAnimation::updateCurrentValue(const QVariant &value)
             {
                 BoxWhiskersData data = qvariant_cast<BoxWhiskersData>(value);
                 m_box->setLayout(data);
             }
             void BoxWhiskersAnimation::setup(const BoxWhiskersData &startData, const BoxWhiskersData &endData)
             {
-                if (endData.m_index == 0) {
-                    qDebug() << "BoxPlotAnimation::setup m_upperExtreme" << endData.m_upperExtreme;
                 setKeyValueAt(0.0, qVariantFromValue(startData));
                 setKeyValueAt(1.0, qVariantFromValue(endData));
             }
+            void BoxWhiskersAnimation::setEndData(const BoxWhiskersData &endData)
+            {
+                if (state() != QAbstractAnimation::Stopped)
+                    stop();
+                setEndValue(qVariantFromValue(endData));
+            }
             #include "moc_boxwhiskersanimation_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/animations/boxwhiskersanimation_p.h +1 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 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(BoxPlotChartItem *item);
                 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);
             protected:
                 BoxPlotChartItem *m_item;
                 BoxWhiskers *m_box;
                 BoxWhiskersData *m_boxData;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // BOXWHISKERSANIMATION_P_H

src/boxplotchart/boxwhiskers.cpp 0 -4

             /****************************************************************************
              **
              ** 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 "boxwhiskers_p.h"
             #include <QPainter>
             #include <QDebug>
             #include <QWidget>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             BoxWhiskers::BoxWhiskers(AbstractDomain *domain, QGraphicsObject *parent) :
                 QGraphicsObject(parent),
                 m_domain(domain)
             {
             }
             BoxWhiskers::~BoxWhiskers()
             {
                 //qDebug() << "BoxWhiskers::~BoxWhiskers()";
             }
             void BoxWhiskers::mousePressEvent(QGraphicsSceneMouseEvent *event)
             {
                 Q_UNUSED(event)
                 qDebug() << "BoxWhiskers::mousePressEvent";
             }
             void BoxWhiskers::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
             {
                 Q_UNUSED(event)
                 qDebug() << "BoxWhiskers::hoverEnterEvent";
             }
             void BoxWhiskers::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
             {
                 Q_UNUSED(event)
                 qDebug() << "BoxWhiskers::hoverLeaveEvent";
             }
             void BoxWhiskers::setBrush(const QBrush &brush)
             {
                 m_brush = brush;
             }
             void BoxWhiskers::setPen(const QPen &pen)
             {
                 m_pen = pen;
             }
             void BoxWhiskers::setLayout(const BoxWhiskersData &data)
             {
                 m_data = data;
             //    if (m_data.m_index == 1)
             //        qDebug() << "BoxWhiskers::setLayout";
                 updateGeometry();
-                //update(0.0, 0.0, m_data.m_domainSize.width(), m_data.m_domainSize.height());
                 update();
             }
             QSizeF BoxWhiskers::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
             {
                 //Q_UNUSED(which)
                 Q_UNUSED(constraint)
                 qDebug() << "BoxWhiskers::sizeHint, which = " << which;
                 return QSizeF();
             }
             void BoxWhiskers::setGeometry(const QRectF &rect) // TODO: Unused?
             {
                 Q_UNUSED(rect)
                 qDebug() << "BoxWhiskers::setGeometry";
             }
             void BoxWhiskers::setDomainSize(const QSizeF &size)
             {
                 m_domainSize = size;
                 updateBoundingRect();
             }
             QRectF BoxWhiskers::boundingRect() const
             {
                 return m_boundingRect;
             }
             void BoxWhiskers::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 Q_UNUSED(option)
                 Q_UNUSED(widget)
                 //Q_UNUSED(painter)
                 //painter->save();
                 //painter->setClipRect(parentItem()->boundingRect());
                 painter->setPen(m_pen);
                 painter->setBrush(m_brush);
                 qreal spanY = m_data.m_maxY - m_data.m_minY;
                 //painter->setClipRect(parentItem()->boundingRect());
                 painter->scale(m_domainSize.width() / m_data.m_boxItems, m_domainSize.height() / spanY);
                 painter->drawPath(m_boxPath);
                 //painter->restore();
             }
             void BoxWhiskers::updateGeometry()
             {
                 prepareGeometryChange();
                 QPainterPath path;
-                // TODO: Dirty hack
-                if (m_data.m_seriesCount == 0) m_data.m_seriesCount = 1;
                 qreal columnWidth = 1.0 / m_data.m_seriesCount;
                 qreal left = 0.25 * columnWidth + columnWidth * m_data.m_seriesIndex;
                 qreal right = 0.75 * columnWidth + columnWidth * m_data.m_seriesIndex;
                 qreal middle = 0.5 * columnWidth + columnWidth * m_data.m_seriesIndex;
                 //whisker = 0.35 0.75
                 // Upper whisker
                 path.moveTo(left + m_data.m_index, m_data.m_maxY - m_data.m_upperExtreme);
                 path.lineTo(right + m_data.m_index, m_data.m_maxY - m_data.m_upperExtreme);
                 path.moveTo(middle + m_data.m_index, m_data.m_maxY - m_data.m_upperExtreme);
                 path.lineTo(middle + m_data.m_index, m_data.m_maxY - m_data.m_upperQuartile);
                 path.closeSubpath();
                 // Middle Box
                 path.addRect(left + m_data.m_index, m_data.m_maxY - m_data.m_upperQuartile,
 .5 * columnWidth, m_data.m_upperQuartile - m_data.m_lowerQuartile);
                 // Median/mean line
                 path.moveTo(left + m_data.m_index, m_data.m_maxY - m_data.m_median);
                 path.lineTo(right + m_data.m_index, m_data.m_maxY - m_data.m_median);
                 // Lower whisker
                 path.moveTo(left + m_data.m_index, m_data.m_maxY - m_data.m_lowerExtreme);
                 path.lineTo(right + m_data.m_index, m_data.m_maxY - m_data.m_lowerExtreme);
                 path.moveTo(middle + m_data.m_index, m_data.m_maxY - m_data.m_lowerExtreme);
                 path.lineTo(middle + m_data.m_index, m_data.m_maxY - m_data.m_lowerQuartile);
                 path.closeSubpath();
                 m_boxPath = path;
                 updateBoundingRect();
             //    qreal scaleY = m_domainSize.height() / (m_data.m_maxY - m_data.m_minY);
             //    qreal scaleX = m_domainSize.width() / m_data.m_boxItems;
             //    QRectF br = path.boundingRect();
             //    m_boundingRect = QRectF( br.x() * scaleX, br.y() * scaleY, br.width() * scaleX, br.height() * scaleY);
                 if (m_data.m_index == 5) {
                     //qDebug() << "myValue = " << myValue;
                     //qDebug() << "m_data.m_upperExtreme" << m_data.m_upperExtreme;
                     //qDebug() << "m_boundingRect = " << m_boundingRect;
             //        qDebug() << "x = " << m_boundingRect.x() << ", y = " << m_boundingRect.y() << ", width = "
             //                 << m_boundingRect.width() << ", height = " << m_boundingRect.height();
                 }
             }
             void BoxWhiskers::updateBoundingRect()
             {
                 qreal scaleY = m_domainSize.height() / (m_data.m_maxY - m_data.m_minY);
                 qreal scaleX = m_domainSize.width() / m_data.m_boxItems;
                 QRectF br = m_boxPath.boundingRect();
                 m_boundingRect = QRectF( br.x() * scaleX, br.y() * scaleY, br.width() * scaleX, br.height() * scaleY);
             }
             #include "moc_boxwhiskers_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

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