From 4f66d1ffeecd95b4bf6666b71536c42dea7450ed Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Mon, 23 Apr 2018 12:31:04 +0200 Subject: Add missing override When deleting a series, the matching chartitem is queried for its animation to stop it. As AbstractBarChartItem sets an animation, it has to provide it to the owner to react properly. Task-number: QTBUG-65552 Change-Id: I44c9c4db823558c78f2fb20cd17642f19160e16e Reviewed-by: Miikka Heikkinen Reviewed-by: Michal Klocek --- src/charts/barchart/abstractbarchartitem.cpp | 5 +++++ src/charts/barchart/abstractbarchartitem_p.h | 1 + 2 files changed, 6 insertions(+) diff --git a/src/charts/barchart/abstractbarchartitem.cpp b/src/charts/barchart/abstractbarchartitem.cpp index 2d0d0e25..099079a6 100644 --- a/src/charts/barchart/abstractbarchartitem.cpp +++ b/src/charts/barchart/abstractbarchartitem.cpp @@ -726,6 +726,11 @@ void AbstractBarChartItem::calculateSeriesPositionAdjustmentAndWidth() } } +ChartAnimation *AbstractBarChartItem::animation() const +{ + return m_animation; +} + #include "moc_abstractbarchartitem_p.cpp" QT_CHARTS_END_NAMESPACE diff --git a/src/charts/barchart/abstractbarchartitem_p.h b/src/charts/barchart/abstractbarchartitem_p.h index 7cb96c77..7afd8ec8 100644 --- a/src/charts/barchart/abstractbarchartitem_p.h +++ b/src/charts/barchart/abstractbarchartitem_p.h @@ -71,6 +71,7 @@ public: virtual void initializeLayout(int set, int category, int layoutIndex, bool resetAnimation) = 0; virtual void applyLayout(const QVector &layout); virtual void setAnimation(BarAnimation *animation); + virtual ChartAnimation *animation() const; void setLayout(const QVector &layout); QRectF geometry() const { return m_rect;} void resetAnimation(); -- cgit v1.2.3