summaryrefslogtreecommitdiffstats
path: root/src/charts/scatterchart/qscatterseries.cpp
diff options
context:
space:
mode:
authorTitta Heikkala <titta.heikkala@theqtcompany.com>2015-09-11 08:50:08 +0300
committerTitta Heikkala <titta.heikkala@theqtcompany.com>2015-09-11 08:34:27 +0000
commit97642714ab1ee0484993593ad2de67a2053a9a57 (patch)
tree0043ba93314b41a2d4785c1afe0ceef258b15969 /src/charts/scatterchart/qscatterseries.cpp
parent6ae307b421c60b7d0e4dde871451f670479b072b (diff)
Added possibility to set duration and easing curve for chart animation
Changed the animation API so that it's possible to change the duration and easing curve of the chart animation. Change-Id: I2ab3e0664a7f30bc2bb7085daa1d97181edb90ba Task-number: QTRD-3496 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Diffstat (limited to 'src/charts/scatterchart/qscatterseries.cpp')
-rw-r--r--src/charts/scatterchart/qscatterseries.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/charts/scatterchart/qscatterseries.cpp b/src/charts/scatterchart/qscatterseries.cpp
index a3008f1b..25e685cc 100644
--- a/src/charts/scatterchart/qscatterseries.cpp
+++ b/src/charts/scatterchart/qscatterseries.cpp
@@ -311,7 +311,8 @@ void QScatterSeriesPrivate::initializeTheme(int index, ChartTheme* theme, bool f
}
}
-void QScatterSeriesPrivate::initializeAnimations(QChart::AnimationOptions options)
+void QScatterSeriesPrivate::initializeAnimations(QChart::AnimationOptions options, int duration,
+ QEasingCurve &curve)
{
ScatterChartItem *item = static_cast<ScatterChartItem *>(m_item.data());
Q_ASSERT(item);
@@ -320,11 +321,11 @@ void QScatterSeriesPrivate::initializeAnimations(QChart::AnimationOptions option
item->animation()->stopAndDestroyLater();
if (options.testFlag(QChart::SeriesAnimations))
- item->setAnimation(new ScatterAnimation(item));
+ item->setAnimation(new ScatterAnimation(item, duration, curve));
else
item->setAnimation(0);
- QAbstractSeriesPrivate::initializeAnimations(options);
+ QAbstractSeriesPrivate::initializeAnimations(options, duration, curve);
}
#include "moc_qscatterseries.cpp"