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>

2 files changed, 26 insertions, 0 deletions

diff --git a/tests/scattertest/scatterchart.cpp b/tests/scattertest/scatterchart.cpp
index 58add6ec..97562861 100644
--- a/tests/scattertest/scatterchart.cpp
+++ b/tests/scattertest/scatterchart.cpp
@@ -55,6 +55,13 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter)
     QObject::connect(&m_timer, &QTimer::timeout, this, &ScatterDataModifier::timeout);
     QObject::connect(m_chart, &Q3DScatter::shadowQualityChanged, this,
                      &ScatterDataModifier::shadowQualityUpdatedByVisual);
+
+    QObject::connect(m_chart, &Q3DScatter::axisXChanged, this,
+                     &ScatterDataModifier::handleAxisXChanged);
+    QObject::connect(m_chart, &Q3DScatter::axisYChanged, this,
+                     &ScatterDataModifier::handleAxisYChanged);
+    QObject::connect(m_chart, &Q3DScatter::axisZChanged, this,
+                     &ScatterDataModifier::handleAxisZChanged);
 }
 
 ScatterDataModifier::~ScatterDataModifier()
@@ -461,6 +468,21 @@ void ScatterDataModifier::removeSeries()
     }
 }
 
+void ScatterDataModifier::handleAxisXChanged(QValue3DAxis *axis)
+{
+    qDebug() << __FUNCTION__ << axis << axis->orientation() << (axis == m_chart->axisX());
+}
+
+void ScatterDataModifier::handleAxisYChanged(QValue3DAxis *axis)
+{
+    qDebug() << __FUNCTION__ << axis << axis->orientation() << (axis == m_chart->axisY());
+}
+
+void ScatterDataModifier::handleAxisZChanged(QValue3DAxis *axis)
+{
+    qDebug() << __FUNCTION__ << axis << axis->orientation() << (axis == m_chart->axisZ());
+}
+
 void ScatterDataModifier::changeShadowQuality(int quality)
 {
     QDataVis::ShadowQuality sq = QDataVis::ShadowQuality(quality);
diff --git a/tests/scattertest/scatterchart.h b/tests/scattertest/scatterchart.h
index 5524929e..903c6fc0 100644
--- a/tests/scattertest/scatterchart.h
+++ b/tests/scattertest/scatterchart.h
@@ -68,6 +68,10 @@ public slots:
     void addSeries();
     void removeSeries();
 
+    void handleAxisXChanged(QValue3DAxis *axis);
+    void handleAxisYChanged(QValue3DAxis *axis);
+    void handleAxisZChanged(QValue3DAxis *axis);
+
 signals:
     void shadowQualityChanged(int quality);