##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Check that areaseries is actually in chart before trying to update....
Check that areaseries is actually in chart before trying to update. When a line series is used both as a series on chart and as an area series boundary, but not at the same time, animation can sometimes get confused as to what series to update if the area series is removed from the chart and the line series is added to the chart while a series animation is running. Task-number: QTRD-3445 Change-Id: Ia3d72d3ceba784b6e162b2c9b678acdc3e3ffcac Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>
Titta Heikkala - - Load All Authors

File last commit:

r2776:bc1f6aa59d42
r2800:891ed0097501
Show More
baranimation.cpp
80 lines | 2.6 KiB | text/x-c | CppLexer
/ src / charts / animations / baranimation.cpp
History | Source | Raw |Copy content |Copy permalink
Jani Honkonen
Add license headers
 r794 /****************************************************************************
**
Titta Heikkala
Copyright header changes...
 r2776 ** Copyright (C) 2015 The Qt Company Ltd
Jani Honkonen
Add license headers
 r794 ** All rights reserved.
Titta Heikkala
Copyright header changes...
 r2776 ** For any questions to The Qt Company, please use contact form at http://qt.io
Jani Honkonen
Add license headers
 r794 **
Titta Heikkala
Updated license headers...
 r2740 ** This file is part of the Qt Charts module.
Jani Honkonen
Add license headers
 r794 **
Titta Heikkala
Updated license headers...
 r2740 ** Licensees holding valid commercial license for Qt may use this file in
** accordance with the Qt License Agreement provided with the Software
** or, alternatively, in accordance with the terms contained in a written
Titta Heikkala
Copyright header changes...
 r2776 ** agreement between you and The Qt Company.
Jani Honkonen
Add license headers
 r794 **
** If you have questions regarding the use of this file, please use
Titta Heikkala
Updated license headers...
 r2740 ** contact form at http://qt.io
Jani Honkonen
Add license headers
 r794 **
****************************************************************************/
Titta Heikkala
Fix include syntax...
 r2714 #include <private/baranimation_p.h>
#include <private/abstractbarchartitem_p.h>
sauimone
Animation framework for barchart.
 r671
sauimone
barchart animation mechanics working. still some todo
 r681 Q_DECLARE_METATYPE(QVector<QRectF>)
sauimone
Animation framework for barchart.
 r671
Titta Heikkala
Qt Charts project file structure change...
 r2712 QT_CHARTS_BEGIN_NAMESPACE
sauimone
Animation framework for barchart.
 r671
sauimone
refactoring internal barchart items
 r1674 BarAnimation::BarAnimation(AbstractBarChartItem *item)
Marek Rosa
Bar animations refactored
 r2316 : ChartAnimation(item),
m_item(item)
sauimone
Animation framework for barchart.
 r671 {
Marek Rosa
Bar animations refactored
 r2316 setDuration(ChartAnimationDuration);
setEasingCurve(QEasingCurve::OutQuart);
sauimone
Animation framework for barchart.
 r671 }
BarAnimation::~BarAnimation()
{
}
QVariant BarAnimation::interpolated(const QVariant &from, const QVariant &to, qreal progress) const
{
Jani Honkonen
Fix deprecation errors from Qt5
 r2241 QVector<QRectF> startVector = qvariant_cast<QVector<QRectF> >(from);
QVector<QRectF> endVector = qvariant_cast<QVector<QRectF> >(to);
sauimone
barchart animation mechanics working. still some todo
 r681 QVector<QRectF> result;
sauimone
Animation framework for barchart.
 r671
Marek Rosa
PieSeries: model now supports custom mapping.
 r1056 Q_ASSERT(startVector.count() == endVector.count());
sauimone
Animation framework for barchart.
 r671
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 for (int i = 0; i < startVector.count(); i++) {
sauimone
correct interpolation for baranimation
 r1879 QRectF start = startVector[i].normalized();
QRectF end = endVector[i].normalized();
Marek Rosa
Bar animations refactored
 r2316 qreal x1 = start.left() + progress * (end.left() - start.left());
qreal x2 = start.right() + progress * (end.right() - start.right());
qreal y1 = start.top() + progress * (end.top() - start.top());
qreal y2 = start.bottom() + progress * (end.bottom() - start.bottom());
sauimone
correct interpolation for baranimation
 r1879
Marek Rosa
Bar animations refactored
 r2316 QRectF value(QPointF(x1, y1), QPointF(x2, y2));
sauimone
fix to baranimations leaving crap on screen with negative bars
 r1824 result << value.normalized();
sauimone
Animation framework for barchart.
 r671 }
return qVariantFromValue(result);
}
Marek Rosa
Bar animations refactored
 r2316 void BarAnimation::updateCurrentValue(const QVariant &value)
{
Marek Rosa
Fixed baranimation blinking
 r2320 if (state() != QAbstractAnimation::Stopped) { //workaround
QVector<QRectF> layout = qvariant_cast<QVector<QRectF> >(value);
m_item->setLayout(layout);
}
Marek Rosa
Bar animations refactored
 r2316 }
void BarAnimation::setup(const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout)
{
QVariantAnimation::KeyValues value;
setKeyValues(value); //workaround for wrong interpolation call
setKeyValueAt(0.0, qVariantFromValue(oldLayout));
setKeyValueAt(1.0, qVariantFromValue(newLayout));
}
sauimone
Animation framework for barchart.
 r671 #include "moc_baranimation_p.cpp"
Titta Heikkala
Qt Charts project file structure change...
 r2712 QT_CHARTS_END_NAMESPACE
Marek Rosa
Bar animations refactored
 r2316