diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-09-18 13:49:23 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-09-19 09:14:13 +0300 |
commit | 98e0c04fe78da9735c2943524bd36648b2654f98 (patch) | |
tree | 3c711ff622e0fb43b358982fb815065e12d49af0 /src/datavisualizationqml2/abstractdeclarative.cpp | |
parent | 0c11550bed204807b8b366fd07862a5da9cd2251 (diff) |
Added possibility to change graph's locale
Locale affects how axis labels are formatted. Default locale is still
the "C".
Task-number: QTRD-3229
Change-Id: I6126ce676906f4bbc91ae0abd18775bc1d564118
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualizationqml2/abstractdeclarative.cpp')
-rw-r--r-- | src/datavisualizationqml2/abstractdeclarative.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp index b062f78c..fdfa55d8 100644 --- a/src/datavisualizationqml2/abstractdeclarative.cpp +++ b/src/datavisualizationqml2/abstractdeclarative.cpp @@ -335,6 +335,12 @@ void AbstractDeclarative::setSharedController(Abstract3DController *controller) &AbstractDeclarative::radialLabelOffsetChanged); QObject::connect(m_controller.data(), &Abstract3DController::horizontalAspectRatioChanged, this, &AbstractDeclarative::horizontalAspectRatioChanged); + QObject::connect(m_controller.data(), &Abstract3DController::reflectionChanged, this, + &AbstractDeclarative::reflectionChanged); + QObject::connect(m_controller.data(), &Abstract3DController::reflectivityChanged, this, + &AbstractDeclarative::reflectivityChanged); + QObject::connect(m_controller.data(), &Abstract3DController::localeChanged, this, + &AbstractDeclarative::localeChanged); } void AbstractDeclarative::activateOpenGLContext(QQuickWindow *window) @@ -780,6 +786,16 @@ qreal AbstractDeclarative::reflectivity() const return m_controller->reflectivity(); } +void AbstractDeclarative::setLocale(const QLocale &locale) +{ + m_controller->setLocale(locale); +} + +QLocale AbstractDeclarative::locale() const +{ + return m_controller->locale(); +} + void AbstractDeclarative::windowDestroyed(QObject *obj) { // Remove destroyed window from window lists |