##// END OF EJS Templates
Fix wrong interpolation call in bar*series, unit tests fixed
Michal Klocek -
r1734:ee6ddf4cebac
parent child
Show More
@@ -56,6 +56,8 void AbstractBarAnimation::updateCurrentValue(const QVariant &value)
56
56
57 void AbstractBarAnimation::setup(const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout)
57 void AbstractBarAnimation::setup(const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout)
58 {
58 {
59 QVariantAnimation::KeyValues value;
60 setKeyValues(value); //workaround for wrong interpolation call
59 setKeyValueAt(0.0, qVariantFromValue(oldLayout));
61 setKeyValueAt(0.0, qVariantFromValue(oldLayout));
60 setKeyValueAt(1.0, qVariantFromValue(newLayout));
62 setKeyValueAt(1.0, qVariantFromValue(newLayout));
61 }
63 }
@@ -29,8 +29,7 QTCOMMERCIALCHART_BEGIN_NAMESPACE
29 BarAnimation::BarAnimation(AbstractBarChartItem *item)
29 BarAnimation::BarAnimation(AbstractBarChartItem *item)
30 :AbstractBarAnimation(item)
30 :AbstractBarAnimation(item)
31 {
31 {
32 setDuration(ChartAnimationDuration);
32
33 setEasingCurve(QEasingCurve::OutQuart);
34 }
33 }
35
34
36 BarAnimation::~BarAnimation()
35 BarAnimation::~BarAnimation()
@@ -303,7 +303,6 void ChartAxis::handleAxisUpdated()
303 setGridVisibility(visible && m_chartAxis->isGridLineVisible());
303 setGridVisibility(visible && m_chartAxis->isGridLineVisible());
304 setLabelsVisibility(visible && m_chartAxis->labelsVisible());
304 setLabelsVisibility(visible && m_chartAxis->labelsVisible());
305 setShadesVisibility(visible && m_chartAxis->shadesVisible());
305 setShadesVisibility(visible && m_chartAxis->shadesVisible());
306
307 setLabelsAngle(m_chartAxis->labelsAngle());
306 setLabelsAngle(m_chartAxis->labelsAngle());
308 setArrowPen(m_chartAxis->axisPen());
307 setArrowPen(m_chartAxis->axisPen());
309 setLabelsPen(m_chartAxis->labelsPen());
308 setLabelsPen(m_chartAxis->labelsPen());
General Comments 0
You need to be logged in to leave comments. Login now