HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r738:ce991d3dee26

Animation folder formating: white spaces, brackets, etc fixed

Marek Rosa -

r738:ce991d3dee26

parent child

Context file:

r738:ce991d3dee26

Collapse all files

src/animations/axisanimation.cpp 0 0

NO CONTENT: modified file

src/animations/axisanimation_p.h 0 0

NO CONTENT: modified file

src/animations/baranimation.cpp 0 0

NO CONTENT: modified file

src/animations/baranimation_p.h 0 0

NO CONTENT: modified file

src/animations/chartanimation_p.h +1 -1

             #ifndef CHARTANIMATION_H_
             #define CHARTANIMATION_H_
             #include "qchartglobal.h"
             #include <QVariantAnimation>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartAnimation: public QVariantAnimation
             {
             public:
                 enum Animation { LineDrawAnimation, MoveDownAnimation, MoveUpAnimation };
-                ChartAnimation(QObject* parent=0):QVariantAnimation(parent),m_type(MoveDownAnimation){};
+                ChartAnimation(QObject* parent=0):QVariantAnimation(parent), m_type(MoveDownAnimation){}
                 void setAnimationType(Animation type){
                     m_type=type;
                 }
             protected:
                 Animation m_type;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif /* AXISITEM_H_ */

src/animations/chartanimator.cpp +13 -22

             #include "chartanimator_p.h"
             #include "axisanimation_p.h"
             #include "xyanimation_p.h"
             #include "splineanimation_p.h"
             #include "xychartitem_p.h"
             #include "pieanimation_p.h"
             #include "baranimation_p.h"
             #include "barchartitem_p.h"
             #include "areachartitem_p.h"
             #include "splinechartitem_p.h"
             #include "scatterchartitem_p.h"
             #include <QTimer>
             Q_DECLARE_METATYPE(QVector<QPointF>)
             Q_DECLARE_METATYPE(QVector<qreal>)
             Q_DECLARE_METATYPE(QVector<QRectF>)
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             const static int duration = 1000;
-            ChartAnimator::ChartAnimator(QObject *parent):QObject(parent),m_state(ShowState)
+            ChartAnimator::ChartAnimator(QObject *parent):QObject(parent),
+                m_state(ShowState)
             {
             }
             ChartAnimator::~ChartAnimator()
             {
             }
             void ChartAnimator::addAnimation(Axis *item)
             {
                 ChartAnimation *animation = m_animations.value(item);
                 if (!animation) {
                     animation = new AxisAnimation(item);
                     m_animations.insert(item, animation);
                 }
                 item->setAnimator(this);
             }
             void ChartAnimator::addAnimation(SplineChartItem *item)
             {
                 ChartAnimation *animation = m_animations.value(item);
                 if (!animation) {
                     animation = new SplineAnimation(item);
                     m_animations.insert(item, animation);
                 }
                 item->setAnimator(this);
             }
             void ChartAnimator::addAnimation(ScatterChartItem *item)
             {
                 ChartAnimation *animation = m_animations.value(item);
                 if (!animation) {
                     animation = new XYAnimation(item);
                     m_animations.insert(item, animation);
                 }
                 item->setAnimator(this);
             }
             void ChartAnimator::addAnimation(LineChartItem *item)
             {
                 ChartAnimation *animation = m_animations.value(item);
                 if (!animation) {
                     animation = new XYAnimation(item);
                     m_animations.insert(item, animation);
                 }
                 item->setAnimator(this);
             }
             void ChartAnimator::addAnimation(PieChartItem *item)
             {
                 ChartAnimation *animation = m_animations.value(item);
                 if (!animation) {
                     animation = new PieAnimation(item);
                     m_animations.insert(item, animation);
                 }
                 item->setAnimator(this);
             }
             void ChartAnimator::addAnimation(BarChartItem *item)
             {
                 ChartAnimation *animation = m_animations.value(item);
                 if (!animation) {
                     animation = new BarAnimation(item);
                     m_animations.insert(item, animation);
                 }
                 item->setAnimator(this);
             }
             void ChartAnimator::removeAnimation(Chart *item)
             {
                 item->setAnimator(0);
                 m_animations.remove(item);
             }
             void ChartAnimator::updateLayout(Axis *item , QVector<qreal> &newLayout)
             {
                 AxisAnimation *animation = static_cast<AxisAnimation*>(m_animations.value(item));
                 Q_ASSERT(animation);
                 QVector<qreal> oldLayout = item->layout();
-                if(newLayout.count()==0) return;
+                if (newLayout.count() == 0)
+                    return;
-                switch(m_state)
+                switch (m_state) {
                 case ZoomOutState: {
                     QRectF rect = item->geometry();
                     oldLayout.resize(newLayout.count());
-                			for(int i=0,j=oldLayout.count()-1;i<(oldLayout.count()+1)/2;i++,j--)
+                    for(int i = 0, j = oldLayout.count() - 1; i < (oldLayout.count() + 1) / 2; i++, j--) {
                         oldLayout[i] = item->axisType() == Axis::X_AXIS ? rect.left() : rect.bottom();
                         oldLayout[j] = item->axisType() == Axis::X_AXIS ? rect.right() : rect.top();
                     }
                 }
                     break;
                 case ZoomInState: {
                     int index = qMin(oldLayout.count() * (item->axisType() == Axis::X_AXIS ? m_point.x() : (1 - m_point.y())), newLayout.count() - 1.0);
                     oldLayout.resize(newLayout.count());
                     for(int i = 0; i < oldLayout.count(); i++)
                         oldLayout[i]= oldLayout[index];
                 }
                     break;
                 case ScrollDownState:
                 case ScrollRightState: {
                     oldLayout.resize(newLayout.count());
                     for(int i = 0, j = i + 1; i < oldLayout.count() - 1; i++, j++)
                         oldLayout[i]= oldLayout[j];
                 }
                     break;
                 case ScrollUpState:
                 case ScrollLeftState: {
                     oldLayout.resize(newLayout.count());
                     for(int i = oldLayout.count() - 1, j = i - 1; i > 0; i--, j--)
                         oldLayout[i]= oldLayout[j];
                 }
                     break;
                 default: {
                     oldLayout.resize(newLayout.count());
                     QRectF rect = item->geometry();
                     for(int i = 0, j = oldLayout.count() - 1; i < oldLayout.count(); i++, j--)
                         oldLayout[i] = item->axisType() == Axis::X_AXIS ? rect.left() : rect.top();
                 }
                     break;
                 }
-                if(animation->state()!=QAbstractAnimation::Stopped) {
+                if (animation->state() != QAbstractAnimation::Stopped)
                     animation->stop();
                 animation->setDuration(duration);
                 animation->setEasingCurve(QEasingCurve::OutQuart);
                 QVariantAnimation::KeyValues value;
                 animation->setKeyValues(value); //workaround for wrong interpolation call
                 animation->setKeyValueAt(0.0, qVariantFromValue(oldLayout));
                 animation->setKeyValueAt(1.0, qVariantFromValue(newLayout));
                 QTimer::singleShot(0, animation, SLOT(start()));
             }
             void ChartAnimator::updateLayout(SplineChartItem *item, QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, QVector<QPointF> &oldControlPoints, QVector<QPointF> &newControlPoints, int index)
             {
                 SplineAnimation *animation = static_cast<SplineAnimation *>(m_animations.value(item));
                 Q_ASSERT(animation);
-                if(newPoints.count()<2 || newControlPoints.count()<2) return;
+                if (newPoints.count() < 2 || newControlPoints.count() < 2)
+                    return;
                 bool empty = oldPoints.count() == 0;
-                if(animation->state()!=QAbstractAnimation::Stopped) {
+                if (animation->state() != QAbstractAnimation::Stopped)
                     animation->stop();
                 animation->setDuration(duration);
                 if (!empty)
                     animation->setAnimationType(ChartAnimation::MoveDownAnimation);
                 else
                     animation->setAnimationType(ChartAnimation::LineDrawAnimation);
                 animation->setEasingCurve(QEasingCurve::OutQuart);
                 animation->setValues(oldPoints, newPoints, oldControlPoints, newControlPoints, index);
                 QTimer::singleShot(0, animation, SLOT(start()));
             }
             void ChartAnimator::updateLayout(XYChartItem *item, QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, int index)
             {
                 XYAnimation *animation = static_cast<XYAnimation *>(m_animations.value(item));
                 Q_ASSERT(animation);
-                if(newPoints.count()==0) return;
+                if (newPoints.count() == 0)
+                    return;
                 bool empty = oldPoints.count() == 0;
-                if(animation->state()!=QAbstractAnimation::Stopped) {
+                if (animation->state() != QAbstractAnimation::Stopped)
                     animation->stop();
                 animation->setDuration(duration);
                 if (!empty)
                     animation->setAnimationType(ChartAnimation::MoveDownAnimation);
                 else
                     animation->setAnimationType(ChartAnimation::LineDrawAnimation);
                 animation->setEasingCurve(QEasingCurve::OutQuart);
                 animation->setValues(oldPoints, newPoints, index);
                 QTimer::singleShot(0, animation, SLOT(start()));
             }
             void ChartAnimator::addAnimation(PieChartItem *item, QPieSlice *slice, const PieSliceData &sliceData, bool isEmpty)
             {
                 PieAnimation *animation = static_cast<PieAnimation *>(m_animations.value(item));
                 Q_ASSERT(animation);
                 animation->addSlice(slice, sliceData, isEmpty);
             }
             void ChartAnimator::removeAnimation(PieChartItem *item, QPieSlice *slice)
             {
                 PieAnimation *animation = static_cast<PieAnimation *>(m_animations.value(item));
                 Q_ASSERT(animation);
                 animation->removeSlice(slice);
             }
             void ChartAnimator::updateLayout(PieChartItem *item, const PieLayout &layout)
             {
                 PieAnimation *animation = static_cast<PieAnimation *>(m_animations.value(item));
                 Q_ASSERT(animation);
                 animation->updateValues(layout);
             }
             void ChartAnimator::updateLayout(PieChartItem *item, QPieSlice *slice, const PieSliceData &sliceData)
             {
                 PieAnimation *animation = static_cast<PieAnimation *>(m_animations.value(item));
                 Q_ASSERT(animation);
                 animation->updateValue(slice, sliceData);
             }
             void ChartAnimator::updateLayout(BarChartItem *item, const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout)
             {
                 BarAnimation *animation = static_cast<BarAnimation *>(m_animations.value(item));
                 Q_ASSERT(animation);
                 animation->setDuration(duration);
                 animation->setKeyValueAt(0.0, qVariantFromValue(oldLayout));
                 animation->setKeyValueAt(1.0, qVariantFromValue(newLayout));
                 QTimer::singleShot(0, animation, SLOT(start()));
             }
             void ChartAnimator::setState(State state, const QPointF &point)
             {
                 m_state = state;
                 m_point = point;
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/animations/chartanimator_p.h 0 0

NO CONTENT: modified file

src/animations/pieanimation.cpp 0 0

NO CONTENT: modified file

src/animations/pieanimation_p.h 0 0

NO CONTENT: modified file

src/animations/splineanimation.cpp +6 -4

             #include "splineanimation_p.h"
             #include "splinechartitem_p.h"
             Q_DECLARE_METATYPE(QVector<QPointF>)
             Q_DECLARE_METATYPE(SplineVector)
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             SplineAnimation::SplineAnimation(SplineChartItem* item):ChartAnimation(item),
                 m_item(item),
                 m_dirty(true)
             {
             }
             SplineAnimation::~SplineAnimation()
             {
             }
             void SplineAnimation::setValues(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, QVector<QPointF> &oldControlPoints, QVector<QPointF> &newControlPoints, int index)
             {
                 int x = oldPoints.count();
                 int y = newPoints.count();
                 Q_ASSERT(newPoints.count() * 2 - 2 == newControlPoints.count());
                 if (x != y && abs(x - y) != 1) {
                     m_oldSpline.first = newPoints;
                     m_oldSpline.second = newControlPoints;
                     oldPoints.resize(newPoints.size());
                     oldControlPoints.resize(newControlPoints.size());
                     SplineVector oldPair;
                     oldPair.first = oldPoints;
                     oldPair.second = oldControlPoints;
                     SplineVector newPair;
                     newPair.first = newPoints;
                     newPair.second = newControlPoints;
                     setKeyValueAt(0.0, qVariantFromValue(oldPair));
                     setKeyValueAt(1.0, qVariantFromValue(newPair));
                     m_dirty = false;
                 }
                 else {
                     if(m_dirty) {
                         m_oldSpline.first = oldPoints;
                         m_oldSpline.second = oldControlPoints;
                         m_dirty = false;
                     }
                     oldPoints = newPoints;
                     oldControlPoints = newControlPoints;
                     if (y < x) {
                         m_oldSpline.first.remove(index); //remove
                         m_oldSpline.second.remove(index * 2);
                         m_oldSpline.second.remove(index * 2);
                     }
                     if (y > x) {
                         m_oldSpline.first.insert(index, x > 0 ? m_oldSpline.first[index-1] : newPoints[index]); //add
                         m_oldSpline.second.insert((index - 1) * 2, x > 1 ? m_oldSpline.second[(index-2)*2] : newControlPoints[(index - 1) * 2]); //add
                         m_oldSpline.second.insert((index - 1) * 2 + 1, x > 1 ? m_oldSpline.second[(index - 2) * 2 + 1] : newControlPoints[(index - 1) * 2 + 1]); //add
                     }
                     SplineVector newPair;
                     newPair.first=newPoints;
                     newPair.second=newControlPoints;
                     setKeyValueAt(0.0, qVariantFromValue(m_oldSpline));
                     setKeyValueAt(1.0, qVariantFromValue(newPair));
                 }
             }
             QVariant SplineAnimation::interpolated(const QVariant &start, const QVariant &end, qreal progress ) const
             {
                 SplineVector startPair  =  qVariantValue< SplineVector >(start);
                 SplineVector endPair =  qVariantValue< SplineVector >(end);
                 SplineVector result;
                 switch (m_type) {
                 case MoveDownAnimation: {
+                    if (startPair.first.count() != endPair.first.count())
-                        if(startPair.first.count() != endPair.first.count()) break;
+                        break;
                     Q_ASSERT(startPair.first.count() * 2 - 2 == startPair.second.count());
                     Q_ASSERT(endPair.first.count() * 2 - 2 == endPair.second.count());
                     for(int i = 0; i < endPair.first.count(); i++) {
                         qreal x = startPair.first[i].x() + ((endPair.first[i].x() - startPair.first[i].x()) * progress);
                         qreal y = startPair.first[i].y() + ((endPair.first[i].y() - startPair.first[i].y()) * progress);
                         result.first << QPointF(x,y);
-                            if(i +1 >= endPair.first.count()) continue;
+                        if (i + 1 >= endPair.first.count())
+                            continue;
                         x = startPair.second[i * 2].x() + ((endPair.second[i * 2].x() - startPair.second[i * 2].x()) * progress);
                         y = startPair.second[i * 2].y() + ((endPair.second[i * 2].y() - startPair.second[i * 2].y()) * progress);
                         result.second << QPoint(x,y);
                         x = startPair.second[i * 2 + 1].x() + ((endPair.second[i * 2 + 1].x() - startPair.second[i * 2 + 1].x()) * progress);
                         y = startPair.second[i * 2 + 1].y() + ((endPair.second[i * 2 + 1].y() - startPair.second[i * 2 + 1].y()) * progress);
                         result.second << QPoint(x,y);
                     }
                 }
                     break;
                 case LineDrawAnimation:{
                     Q_ASSERT(endPair.first.count() * 2 - 2 == endPair.second.count());
                     int count = endPair.first.count()* qBound(0.0, progress, 1.0);
                     for(int i = 0; i < count; i++) {
                         result.first << endPair.first[i];
-                            if(i+1==count) break;
+                        if(i + 1 == count)
+                            break;
                         result.second << endPair.second[2 * i];
                         result.second << endPair.second[2 * i + 1];
                     }
                 }
                     break;
                 default:
                     qWarning() << "Unknow type of animation";
                     break;
                 }
                 return qVariantFromValue(result);
             }
             void SplineAnimation::updateCurrentValue (const QVariant &value )
             {
                 if (state() != QAbstractAnimation::Stopped) { //workaround
                     m_dirty = true;
                     QPair<QVector<QPointF >, QVector<QPointF > > pair = qVariantValue< QPair< QVector<QPointF>, QVector<QPointF> > >(value);
                     m_item->setLayout(pair.first, pair.second);
                 }
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/animations/splineanimation_p.h 0 -1

             #ifndef SPLINEANIMATION_P_H_
             #define SPLINEANIMATION_P_H_
             #include "chartanimation_p.h"
             #include <QPointF>
             typedef  QPair<QVector<QPointF >, QVector<QPointF > >  SplineVector;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class SplineChartItem;
             class SplineAnimation : public ChartAnimation
             {
             public:
                 SplineAnimation(SplineChartItem* item);
                 ~SplineAnimation();
                 void setValues(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, QVector<QPointF> &oldContorlPoints, QVector<QPointF> &newControlPoints, int index);
             protected:
                 QVariant interpolated(const QVariant &start, const QVariant &end, qreal progress) const;
                 void updateCurrentValue(const QVariant &value);
             private:
                 SplineVector m_oldSpline;
                 SplineChartItem *m_item;
                 bool m_dirty;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/animations/xyanimation.cpp +7 -6

             #include "xyanimation_p.h"
             #include "xychartitem_p.h"
             Q_DECLARE_METATYPE(QVector<QPointF>)
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             XYAnimation::XYAnimation(XYChartItem *item):ChartAnimation(item),
                 m_item(item),
                 m_dirty(false)
             {
             }
             XYAnimation::~XYAnimation()
             {
             }
             void XYAnimation::setValues(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, int index)
             {
                 int x = oldPoints.count();
                 int y = newPoints.count();
                 if (x != y && abs(x - y) != 1) {
                     m_oldPoints = newPoints;
                     oldPoints.resize(newPoints.size());
                     setKeyValueAt(0.0, qVariantFromValue(oldPoints));
                     setKeyValueAt(1.0, qVariantFromValue(newPoints));
                     m_dirty = false;
                 }
                 else {
                     if (m_dirty) {
                         m_oldPoints = oldPoints;
                         m_dirty = false;
                     }
                     oldPoints = newPoints;
-                    if (y<x) (m_oldPoints.remove(index)); //remove
+                    if (y < x)
-                    if (y>x) (m_oldPoints.insert(index,x>0?m_oldPoints[index-1]:newPoints[index])); //add
+                        m_oldPoints.remove(index); //remove
+                    if (y > x)
+                        m_oldPoints.insert(index, x > 0 ? m_oldPoints[index-1] : newPoints[index]); //add
                     setKeyValueAt(0.0, qVariantFromValue(m_oldPoints));
                     setKeyValueAt(1.0, qVariantFromValue(newPoints));
                     Q_ASSERT(m_oldPoints.count() == newPoints.count());
                 }
             }
             QVariant XYAnimation::interpolated(const QVariant &start, const QVariant &end, qreal progress ) const
             {
                 QVector<QPointF> startVector = qVariantValue<QVector<QPointF> >(start);
                 QVector<QPointF> endVector = qVariantValue<QVector<QPointF> >(end);
                 QVector<QPointF> result;
                 switch (m_type) {
                 case MoveDownAnimation: {
-                        if(startVector.count() != endVector.count()) break;
+                    if (startVector.count() != endVector.count())
+                        break;
                     for(int i = 0; i < startVector.count(); i++) {
                         qreal x = startVector[i].x() + ((endVector[i].x() - startVector[i].x()) * progress);
                         qreal y = startVector[i].y() + ((endVector[i].y() - startVector[i].y()) * progress);
                         result << QPointF(x, y);
                     }
                 }
                     break;
                 case LineDrawAnimation: {
-                        for(int i =0;i< endVector.count()* qBound(0.0, progress, 1.0);i++) {
+                    for(int i = 0; i < endVector.count() * qBound(0.0, progress, 1.0); i++)
                         result << endVector[i];
                 }
                     break;
                 default:
                     qWarning() << "Unknown type of animation";
                     break;
                 }
                 return qVariantFromValue(result);
             }
             void XYAnimation::updateCurrentValue (const QVariant &value)
             {
                 if(state()!=QAbstractAnimation::Stopped){ //workaround
                     m_dirty = true;
                     QVector<QPointF> vector = qVariantValue<QVector<QPointF> >(value);
                     m_item->setLayout(vector);
                 }
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/animations/xyanimation_p.h 0 0

NO CONTENT: modified file

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