##// END OF EJS Templates
Fix zooming...
Fix zooming If chart is zoomed only horizontally or vertically then the range for the other direction should not change. This is now checked by comparing the minimum and maximum values to the axis span. Change-Id: Icb5e14fc41afcedd7f75e60ca3ad6f699b053ae7 Task-number: QTRD-3399 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

File last commit:

r2714:929d943d1aab
r2728:2e341eff31af
Show More
xyanimation.cpp
155 lines | 4.6 KiB | text/x-c | CppLexer
/****************************************************************************
**
** Copyright (C) 2014 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 Enterprise Charts Add-on.
**
** $QT_BEGIN_LICENSE$
** Licensees holding valid Qt Enterprise licenses may use this file in
** accordance with the Qt Enterprise 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 <private/xyanimation_p.h>
#include <private/xychart_p.h>
#include <QtCore/QDebug>
Q_DECLARE_METATYPE(QVector<QPointF>)
QT_CHARTS_BEGIN_NAMESPACE
XYAnimation::XYAnimation(XYChart *item)
: ChartAnimation(item),
m_type(NewAnimation),
m_dirty(false),
m_index(-1),
m_item(item)
{
setDuration(ChartAnimationDuration);
setEasingCurve(QEasingCurve::OutQuart);
}
XYAnimation::~XYAnimation()
{
}
void XYAnimation::setup(const QVector<QPointF> &oldPoints, const QVector<QPointF> &newPoints, int index)
{
m_type = NewAnimation;
if (state() != QAbstractAnimation::Stopped) {
stop();
m_dirty = false;
}
if (!m_dirty) {
m_dirty = true;
m_oldPoints = oldPoints;
}
m_newPoints = newPoints;
int x = m_oldPoints.count();
int y = m_newPoints.count();
int diff = x - y;
int requestedDiff = oldPoints.count() - y;
// m_oldPoints can be whatever between 0 and actual points count if new animation setup
// interrupts a previous animation, so only do remove and add animations if both
// stored diff and requested diff indicate add or remove. Also ensure that index is not
// invalid.
if (diff == 1 && requestedDiff == 1 && index >= 0 && y > 0 && index <= y) {
//remove point
m_newPoints.insert(index, index > 0 ? newPoints[index - 1] : newPoints[index]);
m_index = index;
m_type = RemovePointAnimation;
}
if (diff == -1 && requestedDiff == -1 && index >= 0 && index <= x) {
//add point
m_oldPoints.insert(index, index > 0 ? newPoints[index - 1] : newPoints[index]);
m_index = index;
m_type = AddPointAnimation;
}
x = m_oldPoints.count();
y = m_newPoints.count();
if (x != y)
m_type = NewAnimation;
else if (m_type == NewAnimation)
m_type = ReplacePointAnimation;
setKeyValueAt(0.0, qVariantFromValue(m_oldPoints));
setKeyValueAt(1.0, qVariantFromValue(m_newPoints));
}
QVariant XYAnimation::interpolated(const QVariant &start, const QVariant &end, qreal progress) const
{
QVector<QPointF> startVector = qvariant_cast<QVector<QPointF> >(start);
QVector<QPointF> endVector = qvariant_cast<QVector<QPointF> >(end);
QVector<QPointF> result;
switch (m_type) {
case ReplacePointAnimation:
case AddPointAnimation:
case RemovePointAnimation: {
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 NewAnimation: {
for (int i = 0; i < endVector.count() * qBound(qreal(0), progress, qreal(1)); 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
QVector<QPointF> vector = qvariant_cast<QVector<QPointF> >(value);
m_item->setGeometryPoints(vector);
m_item->updateGeometry();
m_item->setDirty(true);
m_dirty = false;
}
}
void XYAnimation::updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState)
{
if (oldState == QAbstractAnimation::Running && newState == QAbstractAnimation::Stopped) {
if (m_item->isDirty() && m_type == RemovePointAnimation) {
if (!m_newPoints.isEmpty())
m_newPoints.remove(m_index);
m_item->setGeometryPoints(m_newPoints);
}
}
}
#include "moc_chartanimation_p.cpp"
QT_CHARTS_END_NAMESPACE