HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r513:c1d8fdd92b71

Adding zoom in out animation support

Michal Klocek -

r513:c1d8fdd92b71

parent child

Context file:

r513:c1d8fdd92b71

Collapse all files

src/axis/axisanimationitem.cpp +32 -9

                 if(newLayout.count()==0) return;
-                QRectF rect = geometry();
+                if(zoomFactor()<0) {
-                oldLayout.resize(newLayout.size());
+                    QRectF rect = geometry();
+                    oldLayout.resize(newLayout.count());
-                for(int i=0;i<oldLayout.count();i++)
+                    for(int i=0,j=oldLayout.count()-1;i<(oldLayout.count()+1)/2;i++,j--)
+                    {
-                    oldLayout[i]= axisType()==X_AXIS?rect.left():rect.top();
+                        oldLayout[i]= axisType()==X_AXIS?rect.left():rect.bottom();
+                        oldLayout[j]= axisType()==X_AXIS?rect.right():rect.top();
+                    }
+                }
+                else {
+                    int index = qMin(oldLayout.count()*zoomFactor(),newLayout.count()-1.0);
+                    oldLayout.resize(newLayout.count());
+                    for(int i=0;i<oldLayout.count();i++)
+                    {
+                        oldLayout[i]= oldLayout[index]; //axisType()==X_AXIS?rect.center.x():rect.center().y();
+                    }
                 }
-                if(m_animation->state()!=QAbstractAnimation::Stopped){
+                if(m_animation->state()!=QAbstractAnimation::Stopped) {
-                   m_animation->stop();
+                    m_animation->stop();
                 }
                 m_animation->setDuration(duration);
                 m_animation->setEasingCurve(QEasingCurve::OutQuart);
+                QVariantAnimation::KeyValues value;
+                m_animation->setKeyValues(value); //workaround for wrong interpolation call
                 m_animation->setKeyValueAt(0.0, qVariantFromValue(oldLayout));
                 m_animation->setKeyValueAt(1.0, qVariantFromValue(newLayout));
                 QTimer::singleShot(0,m_animation,SLOT(start()));
             }
                 QVector<qreal> startVector = qVariantValue<QVector<qreal> >(start);
                 QVector<qreal> endVecotr = qVariantValue<QVector<qreal> >(end);
                 QVector<qreal> result;
                 Q_ASSERT(startVector.count() == endVecotr.count());
                 for(int i =0 ;i< startVector.count();i++){
             void AxisAnimator::updateCurrentValue (const QVariant & value )
             {
-                QVector<qreal> vector = qVariantValue<QVector<qreal> >(value);
+                //Q_ASSERT(state()!=QAbstractAnimation::Stopped);
-                m_axis->setLayout(vector);
+                if(state()!=QAbstractAnimation::Stopped)//workaround
+                {
+                    QVector<qreal> vector = qVariantValue<QVector<qreal> >(value);
+                    m_axis->setLayout(vector);
+                }
             }
             #include "moc_axisanimationitem_p.cpp"

src/axis/axisitem.cpp +27 -13

             m_axis(parent),
             m_min(0),
             m_max(0),
-            m_ticksCount(0)
+            m_ticksCount(0),
+            m_zoomFactor(0)
             {
                 //initial initialization
                 m_axis.setZValue(ChartPresenter::AxisZValue);
                         labels << label;
                     }
                 }
                 return labels;
             }
             		createItems(-diff);
             	}
+            	if(diff!=0) handleAxisUpdated();
+                QStringList ticksList = createLabels(m_ticksCount,m_min,m_max);
             	QList<QGraphicsItem *> lines = m_grid.childItems();
             	QList<QGraphicsItem *> labels = m_labels.childItems();
             	QList<QGraphicsItem *> shades = m_shades.childItems();
             	QList<QGraphicsItem *> axis = m_axis.childItems();
-            	Q_ASSERT(labels.size() == m_ticksList.size());
+            	Q_ASSERT(labels.size() == ticksList.size());
-            	Q_ASSERT(layout.size() == m_ticksList.size());
+            	Q_ASSERT(layout.size() == ticksList.size());
             	switch (m_type)
             	{
             				QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem*>(lines.at(i));
             				lineItem->setLine(layout[i], m_rect.top(), layout[i], m_rect.bottom());
             				QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem*>(labels.at(i));
-            				labelItem->setText(m_ticksList.at(i));
+            				labelItem->setText(ticksList.at(i));
             				QPointF center = labelItem->boundingRect().center();
             				labelItem->setTransformOriginPoint(center.x(), center.y());
             				labelItem->setPos(layout[i] - center.x(), m_rect.bottom() + label_padding);
             				QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem*>(lines.at(i));
             				lineItem->setLine(m_rect.left() , layout[i], m_rect.right(), layout[i]);
             				QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem*>(labels.at(i));
-            				labelItem->setText(m_ticksList.at(i));
+            				labelItem->setText(ticksList.at(i));
             				QPointF center = labelItem->boundingRect().center();
             				labelItem->setTransformOriginPoint(center.x(), center.y());
             				labelItem->setPos(m_rect.left() - labelItem->boundingRect().width() - label_padding , layout[i]-center.y());
             		break;
             	}
-            	if(diff!=0) handleAxisUpdated();
+            	//if(diff!=0) handleAxisUpdated();
             	m_layoutVector=layout;
             }
             void AxisItem::handleAxisCategoriesUpdated()
             {
             	if(isEmpty()) return;
-            	m_ticksList = createLabels(m_ticksCount,m_min,m_max);
             	updateLayout(m_layoutVector);
             }
                 int count = m_chartAxis->ticksCount();
                 if(m_ticksCount!=count){
-                	handleTicksCountChanged(count);
+                	//handleTicksCountChanged(count);
                 }
                 if(isEmpty()) return;
             	m_ticksCount=count;
             	if(isEmpty()) return;
-            	m_ticksList = createLabels(m_ticksCount,m_min,m_max);
             	QVector<qreal> layout = calculateLayout();
             	updateLayout(layout);
             }
             void AxisItem::handleRangeChanged(qreal min, qreal max)
             {
+                if(m_min<min || m_max>max){
+                    m_zoomFactor = (min + (max-min)/2 - m_min)/(m_max - m_min);
+                }
+                else
+                    m_zoomFactor=-1;
                 m_min = min;
                 m_max = max;
+                m_ticksCount = qrand()%10;
+                while(m_ticksCount<2){
+                    m_ticksCount = qrand()%10;
+                }
+                qDebug()<<"Warning : This is testing . Simulating new random ticks "<<  m_ticksCount;
+                //m_chartAxis->setTicksCount(m_ticksCount);
                 if(isEmpty()) return;
-                m_ticksList = createLabels(m_ticksCount,m_min,m_max);
                 QVector<qreal> layout = calculateLayout();
                 updateLayout(layout);
                 m_rect = rect;
                 if(isEmpty()) return;
-                m_ticksList = createLabels(m_ticksCount,m_min,m_max);
                 QVector<qreal> layout = calculateLayout();
                 updateLayout(layout);
             }

src/axis/axisitem_p.h +3 -2

                 void setLabelsBrush(const QBrush& brush);
                 void setLabelsFont(const QFont& font);
-                QRectF geometry() const { return m_rect; }
+                inline QRectF geometry() const { return m_rect; }
+                inline qreal zoomFactor() const { return m_zoomFactor;}
             public slots:
                 void handleAxisUpdated();
                 QGraphicsItemGroup m_shades;
                 QGraphicsItemGroup m_labels;
                 QGraphicsItemGroup m_axis;
-                QStringList m_ticksList;
                 QVector<qreal> m_layoutVector;
                 qreal m_min;
                 qreal m_max;
                 int m_ticksCount;
+                qreal m_zoomFactor;
             };

src/linechart/linechartitem.cpp 0 -1

             	//m_items.setZValue(ChartPresenter::LineChartZValue);
                 setZValue(ChartPresenter::LineChartZValue);
                 QObject::connect(series,SIGNAL(updated()),this,SLOT(handleUpdated()));
                 handleUpdated();
             }

src/xychart/xychartanimationitem_p.h +8 -3

                 QVector<QPointF> oldPoints = T::points();
                 if(newPoints.count()==0) return;
+                bool empty = oldPoints.count()==0;
                 oldPoints.resize(newPoints.size());
                 if(m_animation->state()!=QAbstractAnimation::Stopped){
                 }
                 m_animation->setDuration(duration);
-                m_animation->setAnimationType(XYChartAnimator<T,U>::LineDrawAnimation);
+                if(!empty)
-                m_animation->setEasingCurve(QEasingCurve::InOutBack);
+                    m_animation->setAnimationType(XYChartAnimator<T,U>::MoveDownAnimation);
+                else
+                    m_animation->setAnimationType(XYChartAnimator<T,U>::LineDrawAnimation);
+                m_animation->setEasingCurve(QEasingCurve::OutQuart);
                 m_animation->setKeyValueAt(0.0, qVariantFromValue(oldPoints));
                 m_animation->setKeyValueAt(1.0, qVariantFromValue(newPoints));
                 QTimer::singleShot(0,m_animation,SLOT(start()));
                 m_animation->setDuration(duration);
                 m_animation->setAnimationType(XYChartAnimator<T,U>::MoveDownAnimation);
-                m_animation->setEasingCurve(QEasingCurve::InOutBack);
+                m_animation->setEasingCurve(QEasingCurve::OutQuart);
                 m_animation->setKeyValueAt(0.0, qVariantFromValue(m_points));
                 m_animation->setKeyValueAt(1.0, qVariantFromValue(newPoints));

src/xychart/xychartanimator_p.h +2 -2

             template <class T, class U>
             void XYChartAnimator<T,U>::updateCurrentValue (const QVariant & value )
             {
-            	QVector<QPointF> vector = qVariantValue<QVector<QPointF> >(value);
             	if(state()!=QAbstractAnimation::Stopped){ //workaround
-                m_item->setGeometry(vector);
+            	    QVector<QPointF> vector = qVariantValue<QVector<QPointF> >(value);
+            	    m_item->setGeometry(vector);
             	}
             }

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