From 450dc3e6d74ffe93a761a5e2491458935ecac7b7 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Thu, 9 Jan 2014 09:55:52 +0200
Subject: 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>
---
 tests/barstest/chart.cpp | 21 +++++++++++++++++++++
 tests/barstest/chart.h   |  4 ++++
 2 files changed, 25 insertions(+)

(limited to 'tests/barstest')

diff --git a/tests/barstest/chart.cpp b/tests/barstest/chart.cpp
index 24fe1b52..4048e807 100644
--- a/tests/barstest/chart.cpp
+++ b/tests/barstest/chart.cpp
@@ -184,6 +184,13 @@ GraphModifier::GraphModifier(Q3DBars *barchart, QColorDialog *colorDialog)
     QObject::connect(m_genericData, &QBar3DSeries::selectedBarChanged, this,
                      &GraphModifier::handleSelectionChange);
 
+    QObject::connect(m_graph, &Q3DBars::rowAxisChanged, this,
+                     &GraphModifier::handleRowAxisChanged);
+    QObject::connect(m_graph, &Q3DBars::columnAxisChanged, this,
+                     &GraphModifier::handleColumnAxisChanged);
+    QObject::connect(m_graph, &Q3DBars::valueAxisChanged, this,
+                     &GraphModifier::handleValueAxisChanged);
+
     m_graph->addSeries(m_temperatureData);
     m_graph->addSeries(m_temperatureData2);
 
@@ -681,6 +688,20 @@ void GraphModifier::setUseNullInputHandler(bool useNull)
         m_graph->setActiveInputHandler(m_defaultInputHandler);
 }
 
+void GraphModifier::handleRowAxisChanged(QCategory3DAxis *axis)
+{
+    qDebug() << __FUNCTION__ << axis << axis->orientation() << (axis == m_graph->rowAxis());
+}
+
+void GraphModifier::handleColumnAxisChanged(QCategory3DAxis *axis)
+{
+    qDebug() << __FUNCTION__ << axis << axis->orientation() << (axis == m_graph->columnAxis());
+}
+
+void GraphModifier::handleValueAxisChanged(QValue3DAxis *axis)
+{
+    qDebug() << __FUNCTION__ << axis << axis->orientation() << (axis == m_graph->valueAxis());
+}
 
 void GraphModifier::changeShadowQuality(int quality)
 {
diff --git a/tests/barstest/chart.h b/tests/barstest/chart.h
index c75e5024..f617a348 100644
--- a/tests/barstest/chart.h
+++ b/tests/barstest/chart.h
@@ -89,6 +89,10 @@ public slots:
     void handleSelectionChange(const QPoint &position);
     void setUseNullInputHandler(bool useNull);
 
+    void handleRowAxisChanged(QCategory3DAxis *axis);
+    void handleColumnAxisChanged(QCategory3DAxis *axis);
+    void handleValueAxisChanged(QValue3DAxis *axis);
+
 signals:
     void shadowQualityChanged(int quality);
 
-- 
cgit v1.2.3