API to query custom item selection

Task-number: QTRD-3046

+ Added missing elementSelected signal to QML

Change-Id: I5e79d8e910d2730e3d2ae5550ce576f01aac0b18
Change-Id: I5e79d8e910d2730e3d2ae5550ce576f01aac0b18
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

2 files changed, 16 insertions, 0 deletions

diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp
index cdcfcf65..375c9bdb 100644
--- a/src/datavisualizationqml2/abstractdeclarative.cpp
+++ b/src/datavisualizationqml2/abstractdeclarative.cpp
@@ -241,6 +241,16 @@ QAbstract3DAxis *AbstractDeclarative::selectedAxis() const
     return m_controller->selectedAxis();
 }
 
+int AbstractDeclarative::selectedCustomItemIndex() const
+{
+    return m_controller->selectedCustomItemIndex();
+}
+
+QCustom3DItem *AbstractDeclarative::selectedCustomItem() const
+{
+    return m_controller->selectedCustomItem();
+}
+
 QQmlListProperty<QCustom3DItem> AbstractDeclarative::customItemList()
 {
     return QQmlListProperty<QCustom3DItem>(this, this,
@@ -293,6 +303,8 @@ void AbstractDeclarative::setSharedController(Abstract3DController *controller)
                      &AbstractDeclarative::themeChanged);
     QObject::connect(m_controller.data(), &Abstract3DController::selectionModeChanged, this,
                      &AbstractDeclarative::handleSelectionModeChange);
+    QObject::connect(m_controller.data(), &Abstract3DController::elementSelected, this,
+                     &AbstractDeclarative::elementSelected);
 
     QObject::connect(m_controller.data(), &Abstract3DController::axisXChanged, this,
                      &AbstractDeclarative::handleAxisXChanged);
diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h
index 7db6c935..3dd07dca 100644
--- a/src/datavisualizationqml2/abstractdeclarative_p.h
+++ b/src/datavisualizationqml2/abstractdeclarative_p.h
@@ -137,6 +137,9 @@ public:
     Q_REVISION(1) Q_INVOKABLE virtual int selectedLabelIndex() const;
     Q_REVISION(1) Q_INVOKABLE virtual QAbstract3DAxis *selectedAxis() const;
 
+    Q_REVISION(1) Q_INVOKABLE virtual int selectedCustomItemIndex() const;
+    Q_REVISION(1) Q_INVOKABLE virtual QCustom3DItem *selectedCustomItem() const;
+
     QQmlListProperty<QCustom3DItem> customItemList();
     static void appendCustomItemFunc(QQmlListProperty<QCustom3DItem> *list,
                                      QCustom3DItem *item);
@@ -191,6 +194,7 @@ signals:
     void renderingModeChanged(AbstractDeclarative::RenderingMode mode);
     Q_REVISION(1) void measureFpsChanged(bool enabled);
     Q_REVISION(1) void currentFpsChanged(qreal fps);
+    Q_REVISION(1) void elementSelected(QAbstract3DGraph::ElementType type);
 
 private:
     QPointer<Abstract3DController> m_controller;