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>

1 files changed, 22 insertions, 0 deletions

diff --git a/tests/surfacetest/graphmodifier.cpp b/tests/surfacetest/graphmodifier.cpp
index bd44c1dc..58aee4cd 100644
--- a/tests/surfacetest/graphmodifier.cpp
+++ b/tests/surfacetest/graphmodifier.cpp
@@ -65,6 +65,13 @@ GraphModifier::GraphModifier(Q3DSurface *graph)
 
     connect(&m_timer, &QTimer::timeout, this, &GraphModifier::timeout);
     connect(m_theSeries, &QSurface3DSeries::selectedPointChanged, this, &GraphModifier::selectedPointChanged);
+
+    QObject::connect(m_graph, &Q3DSurface::axisXChanged, this,
+                     &GraphModifier::handleAxisXChanged);
+    QObject::connect(m_graph, &Q3DSurface::axisYChanged, this,
+                     &GraphModifier::handleAxisYChanged);
+    QObject::connect(m_graph, &Q3DSurface::axisZChanged, this,
+                     &GraphModifier::handleAxisZChanged);
 }
 
 GraphModifier::~GraphModifier()
@@ -393,6 +400,21 @@ void GraphModifier::timeout()
     m_theSeries->dataProxy()->resetArray(m_planeArray);
 }
 
+void GraphModifier::handleAxisXChanged(QValue3DAxis *axis)
+{
+    qDebug() << __FUNCTION__ << axis << axis->orientation() << (axis == m_graph->axisX());
+}
+
+void GraphModifier::handleAxisYChanged(QValue3DAxis *axis)
+{
+    qDebug() << __FUNCTION__ << axis << axis->orientation() << (axis == m_graph->axisY());
+}
+
+void GraphModifier::handleAxisZChanged(QValue3DAxis *axis)
+{
+    qDebug() << __FUNCTION__ << axis << axis->orientation() << (axis == m_graph->axisZ());
+}
+
 void GraphModifier::resetArrayAndSliders(QSurfaceDataArray *array, float minZ, float maxZ, float minX, float maxX)
 {
     m_axisMinSliderX->setValue(minX);