diff options
Diffstat (limited to 'src/animations/axisanimation.cpp')
-rw-r--r-- | src/animations/axisanimation.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/animations/axisanimation.cpp b/src/animations/axisanimation.cpp index e59d9aae..fab017e1 100644 --- a/src/animations/axisanimation.cpp +++ b/src/animations/axisanimation.cpp @@ -19,14 +19,15 @@ ****************************************************************************/ #include "axisanimation_p.h" -#include "chartaxis_p.h" +#include "chartaxiselement_p.h" +#include "qabstractaxis_p.h" Q_DECLARE_METATYPE(QVector<qreal>) QTCOMMERCIALCHART_BEGIN_NAMESPACE -AxisAnimation::AxisAnimation(ChartAxis *axis) +AxisAnimation::AxisAnimation(ChartAxisElement *axis) : ChartAnimation(axis), m_axis(axis), m_type(DefaultAnimation) @@ -68,13 +69,13 @@ void AxisAnimation::setValues(QVector<qreal> &oldLayout, QVector<qreal> &newLayo oldLayout.resize(newLayout.count()); for (int i = 0, j = oldLayout.count() - 1; i < (oldLayout.count() + 1) / 2; ++i, --j) { - oldLayout[i] = m_axis->orientation() == Qt::Horizontal ? rect.left() : rect.bottom(); - oldLayout[j] = m_axis->orientation() == Qt::Horizontal ? rect.right() : rect.top(); + oldLayout[i] = m_axis->axis()->orientation() == Qt::Horizontal ? rect.left() : rect.bottom(); + oldLayout[j] = m_axis->axis()->orientation() == Qt::Horizontal ? rect.right() : rect.top(); } } break; case ZoomInAnimation: { - int index = qMin(oldLayout.count() * (m_axis->orientation() == Qt::Horizontal ? m_point.x() : (1 - m_point.y())), newLayout.count() - (qreal)1.0); + int index = qMin(oldLayout.count() * (m_axis->axis()->orientation() == Qt::Horizontal ? m_point.x() : (1 - m_point.y())), newLayout.count() - (qreal)1.0); oldLayout.resize(newLayout.count()); for (int i = 0; i < oldLayout.count(); i++) @@ -99,7 +100,7 @@ void AxisAnimation::setValues(QVector<qreal> &oldLayout, QVector<qreal> &newLayo oldLayout.resize(newLayout.count()); QRectF rect = m_axis->gridGeometry(); for (int i = 0, j = oldLayout.count() - 1; i < oldLayout.count(); ++i, --j) - oldLayout[i] = m_axis->orientation() == Qt::Horizontal ? rect.left() : rect.top(); + oldLayout[i] = m_axis->axis()->orientation() == Qt::Horizontal ? rect.left() : rect.top(); } break; } |