From e0b267cfb7c5f6ee84e66c52efb4dffb0c750984 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Mon, 7 Oct 2019 17:49:59 +0300 Subject: Pass CategoryRange label change to parent QCategoryAxis MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: QTBUG-78439 Change-Id: I1c0de505c73ea42e67947fed91a535a117a2ad5b Reviewed-by: Mahmoud Badri Reviewed-by: Tomi Korpipää --- src/chartsqml2/declarativecategoryaxis.cpp | 8 ++++++++ src/chartsqml2/declarativecategoryaxis_p.h | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/chartsqml2/declarativecategoryaxis.cpp b/src/chartsqml2/declarativecategoryaxis.cpp index 1b1826fd..8f6a2b20 100644 --- a/src/chartsqml2/declarativecategoryaxis.cpp +++ b/src/chartsqml2/declarativecategoryaxis.cpp @@ -64,6 +64,14 @@ DeclarativeCategoryRange::DeclarativeCategoryRange(QObject *parent) : { } +void DeclarativeCategoryRange::setLabel(const QString &label) +{ + auto catAxis = qobject_cast(parent()); + if (catAxis) + catAxis->replaceLabel(m_label, label); + m_label = label; +} + DeclarativeCategoryAxis::DeclarativeCategoryAxis(QObject *parent) : QCategoryAxis(parent), m_labelsPosition(AxisLabelsPositionCenter) diff --git a/src/chartsqml2/declarativecategoryaxis_p.h b/src/chartsqml2/declarativecategoryaxis_p.h index 9bcd7ba8..1c1ba850 100644 --- a/src/chartsqml2/declarativecategoryaxis_p.h +++ b/src/chartsqml2/declarativecategoryaxis_p.h @@ -58,7 +58,7 @@ public: qreal endValue() { return m_endValue; } void setEndValue(qreal endValue) { m_endValue = endValue; } QString label() { return m_label; } - void setLabel(QString label) { m_label = label; } + void setLabel(const QString &label); private: qreal m_endValue; -- cgit v1.2.3