diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-09 09:55:52 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-09 11:02:27 +0200 |
| commit | 450dc3e6d74ffe93a761a5e2491458935ecac7b7 (patch) | |
| tree | 99184e6eddb3d8529733de2b273e93b8b96bb73b /src/datavisualization/engine/abstract3dcontroller.cpp | |
| parent | 466c03c4e560b875121090bf883d9aefa9d44616 (diff) | |
Make active axes properties in C++
Also provide axis changed signals both C++ and QML.
Some other minor fixes, too.
Task-number: QTRD-2669
Change-Id: Ib797bffd6720382cf26359a9059e1809efdf58da
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavisualization/engine/abstract3dcontroller.cpp')
| -rw-r--r-- | src/datavisualization/engine/abstract3dcontroller.cpp | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp index 43d7a6d5..14585679 100644 --- a/src/datavisualization/engine/abstract3dcontroller.cpp +++ b/src/datavisualization/engine/abstract3dcontroller.cpp @@ -464,7 +464,11 @@ void Abstract3DController::handleThemeTypeChanged(Q3DTheme::Theme theme) void Abstract3DController::setAxisX(QAbstract3DAxis *axis) { - setAxisHelper(QAbstract3DAxis::AxisOrientationX, axis, &m_axisX); + // Setting null axis will always create new default axis + if (!axis || axis != m_axisX) { + setAxisHelper(QAbstract3DAxis::AxisOrientationX, axis, &m_axisX); + emit axisXChanged(m_axisX); + } } QAbstract3DAxis *Abstract3DController::axisX() @@ -474,7 +478,11 @@ QAbstract3DAxis *Abstract3DController::axisX() void Abstract3DController::setAxisY(QAbstract3DAxis *axis) { - setAxisHelper(QAbstract3DAxis::AxisOrientationY, axis, &m_axisY); + // Setting null axis will always create new default axis + if (!axis || axis != m_axisY) { + setAxisHelper(QAbstract3DAxis::AxisOrientationY, axis, &m_axisY); + emit axisYChanged(m_axisY); + } } QAbstract3DAxis *Abstract3DController::axisY() @@ -484,7 +492,11 @@ QAbstract3DAxis *Abstract3DController::axisY() void Abstract3DController::setAxisZ(QAbstract3DAxis *axis) { - setAxisHelper(QAbstract3DAxis::AxisOrientationZ, axis, &m_axisZ); + // Setting null axis will always create new default axis + if (!axis || axis != m_axisZ) { + setAxisHelper(QAbstract3DAxis::AxisOrientationZ, axis, &m_axisZ); + emit axisZChanged(m_axisZ); + } } QAbstract3DAxis *Abstract3DController::axisZ() |