HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2564:b874ab753024

Fix animation artifact with boxplots....

Miikka Heikkinen -

r2564:b874ab753024

parent child

Context file:

r2564:b874ab753024

Collapse all files

src/animations/boxplotanimation.cpp +6 -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 "boxplotanimation_p.h"
             #include "boxplotchartitem_p.h"
             #include "boxwhiskersdata_p.h"
             #include "boxwhiskersanimation_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             BoxPlotAnimation::BoxPlotAnimation(BoxPlotChartItem *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, this);
                     m_animations.insert(box, animation);
                     BoxWhiskersData start;
+                    start.m_lowerExtreme = box->m_data.m_median;
+                    start.m_lowerQuartile = box->m_data.m_median;
                     start.m_median = box->m_data.m_median;
+                    start.m_upperQuartile = box->m_data.m_median;
+                    start.m_upperExtreme = 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;
+                    animation->m_changeAnimation = false;
                 return animation;
             }
             ChartAnimation *BoxPlotAnimation::boxChangeAnimation(BoxWhiskers *box)
             {
                 BoxWhiskersAnimation *animation = m_animations.value(box);
-                animation->m_moveMedianLine = true;
+                animation->m_changeAnimation = 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 (BoxWhiskers *box, m_animations.keys()) {
                     BoxWhiskersAnimation *animation = m_animations.value(box);
                     animation->stopAndDestroyLater();
                     m_animations.remove(box);
                 }
             }
             void BoxPlotAnimation::removeBoxAnimation(BoxWhiskers *box)
             {
                 m_animations.remove(box);
             }
             #include "moc_boxplotanimation_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/animations/boxwhiskersanimation.cpp +1 -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 "boxwhiskersanimation_p.h"
             #include "boxplotanimation_p.h"
             #include "boxplotchartitem_p.h"
             #include "boxwhiskersdata_p.h"
             Q_DECLARE_METATYPE(QVector<QRectF>)
             Q_DECLARE_METATYPE(QTCOMMERCIALCHART_NAMESPACE::BoxWhiskersData)
             Q_DECLARE_METATYPE(qreal)
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             BoxWhiskersAnimation::BoxWhiskersAnimation(BoxWhiskers *box, BoxPlotAnimation *boxPlotAnimation)
                 : ChartAnimation(box),
                   m_box(box),
                   m_boxPlotAnimation(boxPlotAnimation)
             {
                 setDuration(ChartAnimationDuration);
                 setEasingCurve(QEasingCurve::OutQuart);
             }
             BoxWhiskersAnimation::~BoxWhiskersAnimation()
             {
                 if (m_boxPlotAnimation)
                     m_boxPlotAnimation->removeBoxAnimation(m_box);
             }
             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 (m_moveMedianLine) {
+                if (m_changeAnimation) {
                     result.m_lowerExtreme = startData.m_lowerExtreme + progress * (endData.m_lowerExtreme - startData.m_lowerExtreme);
                     result.m_lowerQuartile = startData.m_lowerQuartile + progress * (endData.m_lowerQuartile - startData.m_lowerQuartile);
                     result.m_median = startData.m_median + progress * (endData.m_median - startData.m_median);
                     result.m_upperQuartile = startData.m_upperQuartile + progress * (endData.m_upperQuartile - startData.m_upperQuartile);
                     result.m_upperExtreme = startData.m_upperExtreme + progress * (endData.m_upperExtreme - startData.m_upperExtreme);
                 } else {
                     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_maxX = endData.m_maxX;
                 result.m_minX = endData.m_minX;
                 result.m_maxY = endData.m_maxY;
                 result.m_minY = endData.m_minY;
                 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)
             {
                 setKeyValueAt(0.0, qVariantFromValue(startData));
                 setKeyValueAt(1.0, qVariantFromValue(endData));
             }
             void BoxWhiskersAnimation::setEndData(const BoxWhiskersData &endData)
             {
                 if (state() != QAbstractAnimation::Stopped)
                     stop();
                 setEndValue(qVariantFromValue(endData));
             }
             void BoxWhiskersAnimation::setStartData(const BoxWhiskersData &endData)
             {
                 if (state() != QAbstractAnimation::Stopped)
                     stop();
                 setStartValue(qVariantFromValue(endData));
             }
             #include "moc_boxwhiskersanimation_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/animations/boxwhiskersanimation_p.h +1 -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 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 BoxPlotAnimation;
             class BoxWhiskersAnimation : public ChartAnimation
             {
                 Q_OBJECT
             public:
                 BoxWhiskersAnimation(BoxWhiskers *box, BoxPlotAnimation *boxPlotAnimation);
                 ~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;
                 BoxWhiskers *m_box;
-                bool m_moveMedianLine;
+                bool m_changeAnimation;
                 BoxPlotAnimation *m_boxPlotAnimation;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // BOXWHISKERSANIMATION_P_H

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages