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>

1 files changed, 19 insertions, 1 deletions

diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp
index fd773675..7c30f1c0 100644
--- a/src/datavisualization/engine/abstract3dcontroller.cpp
+++ b/src/datavisualization/engine/abstract3dcontroller.cpp
@@ -1268,7 +1268,8 @@ void Abstract3DController::handlePendingClick()
 int Abstract3DController::selectedLabelIndex() const
 {
     int index = m_renderer->m_selectedLabelIndex;
-    if (selectedAxis()->labels().count() <= index)
+    QAbstract3DAxis *axis = selectedAxis();
+    if (axis && axis->labels().count() <= index)
         index = -1;
     return index;
 }
@@ -1295,4 +1296,21 @@ QAbstract3DAxis *Abstract3DController::selectedAxis() const
     return axis;
 }
 
+int Abstract3DController::selectedCustomItemIndex() const
+{
+    int index = m_renderer->m_selectedCustomItemIndex;
+    if (m_customItems.count() <= index)
+        index = -1;
+    return index;
+}
+
+QCustom3DItem *Abstract3DController::selectedCustomItem() const
+{
+    QCustom3DItem *item = 0;
+    int index = selectedCustomItemIndex();
+    if (index >= 0)
+        item = m_customItems[index];
+    return item;
+}
+
 QT_END_NAMESPACE_DATAVISUALIZATION