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

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

             {
             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;
                 }

src/animations/chartanimator.cpp +13 -22

             const static int duration = 1000;
-            ChartAnimator::ChartAnimator(QObject *parent):QObject(parent),m_state(ShowState)
+            ChartAnimator::ChartAnimator(QObject *parent):QObject(parent),
+                m_state(ShowState)
             {
             }
                 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();
                     }
                     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);
                 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)
                 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)

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

                 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);
                     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];
                     }

src/animations/splineanimation_p.h 0 -1

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class SplineChartItem;
             class SplineAnimation : public ChartAnimation

src/animations/xyanimation.cpp +7 -6

             void XYAnimation::setValues(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, int index)
             {
                 int x = oldPoints.count();
                 int y = newPoints.count();
                         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());
                 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);
                 }
                     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";

src/animations/xyanimation_p.h 0 0

NO CONTENT: modified file

	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