From ee6ddf4cebac3b041dd45c718ee58388e9bdfc1d 2012-07-24 10:10:34 From: Michal Klocek Date: 2012-07-24 10:10:34 Subject: [PATCH] Fix wrong interpolation call in bar*series, unit tests fixed --- diff --git a/src/animations/abstractbaranimation.cpp b/src/animations/abstractbaranimation.cpp index aa149fc..17fe7f0 100644 --- a/src/animations/abstractbaranimation.cpp +++ b/src/animations/abstractbaranimation.cpp @@ -56,6 +56,8 @@ void AbstractBarAnimation::updateCurrentValue(const QVariant &value) void AbstractBarAnimation::setup(const QVector &oldLayout, const QVector &newLayout) { + QVariantAnimation::KeyValues value; + setKeyValues(value); //workaround for wrong interpolation call setKeyValueAt(0.0, qVariantFromValue(oldLayout)); setKeyValueAt(1.0, qVariantFromValue(newLayout)); } diff --git a/src/animations/baranimation.cpp b/src/animations/baranimation.cpp index 6c7018b..60a7d3a 100644 --- a/src/animations/baranimation.cpp +++ b/src/animations/baranimation.cpp @@ -29,8 +29,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE BarAnimation::BarAnimation(AbstractBarChartItem *item) :AbstractBarAnimation(item) { - setDuration(ChartAnimationDuration); - setEasingCurve(QEasingCurve::OutQuart); + } BarAnimation::~BarAnimation() diff --git a/src/axis/chartaxis.cpp b/src/axis/chartaxis.cpp index 6b7acd6..e8aa6ba 100644 --- a/src/axis/chartaxis.cpp +++ b/src/axis/chartaxis.cpp @@ -303,7 +303,6 @@ void ChartAxis::handleAxisUpdated() setGridVisibility(visible && m_chartAxis->isGridLineVisible()); setLabelsVisibility(visible && m_chartAxis->labelsVisible()); setShadesVisibility(visible && m_chartAxis->shadesVisible()); - setLabelsAngle(m_chartAxis->labelsAngle()); setArrowPen(m_chartAxis->axisPen()); setLabelsPen(m_chartAxis->labelsPen());