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

             #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)
                 return m_animations.value(box);
             }
             //#include "moc_boxplotanimation_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/animations/boxwhiskersanimation.cpp +11 -4

             #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)
                 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::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

                 virtual void updateCurrentValue(const QVariant &value);
                 void setup(const BoxWhiskersData &startData, const BoxWhiskersData &endData);
+                void setEndData(const BoxWhiskersData &endData);
             protected:
                 BoxPlotChartItem *m_item;

src/boxplotchart/boxwhiskers.cpp 0 -4

             //    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();
             }
                 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;

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