diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-06-25 14:45:01 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-06-26 10:43:44 +0300 |
| commit | ffba0218893cd25b08718d4d6fd0c40c95aecf47 (patch) | |
| tree | c9663278f30d77862d374edcd4cab8f171b5a663 /src/datavisualizationqml2 | |
| parent | 36417dd3660f75c34328c3420bdd512436da86ff (diff) | |
Add radialLabelOffset property for graphs
This property indicates where radial labels of the polar chart are
drawn
Task-number: QTRD-3184
Change-Id: I1500e67da5e578b90d679876130c2d56c1d08039
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavisualizationqml2')
| -rw-r--r-- | src/datavisualizationqml2/abstractdeclarative.cpp | 12 | ||||
| -rw-r--r-- | src/datavisualizationqml2/abstractdeclarative_p.h | 5 |
2 files changed, 17 insertions, 0 deletions
diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp index 30acc9e4..5182e96a 100644 --- a/src/datavisualizationqml2/abstractdeclarative.cpp +++ b/src/datavisualizationqml2/abstractdeclarative.cpp @@ -331,6 +331,8 @@ void AbstractDeclarative::setSharedController(Abstract3DController *controller) &AbstractDeclarative::handleOptimizationHintChange); QObject::connect(m_controller.data(), &Abstract3DController::polarChanged, this, &AbstractDeclarative::polarChanged); + QObject::connect(m_controller.data(), &Abstract3DController::radialLabelOffsetChanged, this, + &AbstractDeclarative::radialLabelOffsetChanged); } void AbstractDeclarative::activateOpenGLContext(QQuickWindow *window) @@ -736,6 +738,16 @@ bool AbstractDeclarative::isPolar() const return m_controller->isPolar(); } +void AbstractDeclarative::setRadialLabelOffset(float offset) +{ + m_controller->setRadialLabelOffset(offset); +} + +float AbstractDeclarative::radialLabelOffset() const +{ + return m_controller->radialLabelOffset(); +} + void AbstractDeclarative::windowDestroyed(QObject *obj) { // Remove destroyed window from window lists diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h index cd3d6134..379e346f 100644 --- a/src/datavisualizationqml2/abstractdeclarative_p.h +++ b/src/datavisualizationqml2/abstractdeclarative_p.h @@ -73,6 +73,7 @@ class AbstractDeclarative : public QQuickItem Q_PROPERTY(qreal aspectRatio READ aspectRatio WRITE setAspectRatio NOTIFY aspectRatioChanged REVISION 1) Q_PROPERTY(OptimizationHints optimizationHints READ optimizationHints WRITE setOptimizationHints NOTIFY optimizationHintsChanged REVISION 1) Q_PROPERTY(bool polar READ isPolar WRITE setPolar NOTIFY polarChanged REVISION 2) + Q_PROPERTY(float radialLabelOffset READ radialLabelOffset WRITE setRadialLabelOffset NOTIFY radialLabelOffsetChanged REVISION 2) public: enum SelectionFlag { @@ -197,6 +198,9 @@ public: void setPolar(bool enable); bool isPolar() const; + void setRadialLabelOffset(float offset); + float radialLabelOffset() const; + public slots: virtual void handleAxisXChanged(QAbstract3DAxis *axis) = 0; virtual void handleAxisYChanged(QAbstract3DAxis *axis) = 0; @@ -235,6 +239,7 @@ signals: Q_REVISION(1) void aspectRatioChanged(qreal ratio); Q_REVISION(1) void optimizationHintsChanged(AbstractDeclarative::OptimizationHints hints); Q_REVISION(2) void polarChanged(bool enabled); + Q_REVISION(2) void radialLabelOffsetChanged(float offset); private: QPointer<Abstract3DController> m_controller; |