Multi series selection part 2: scatter

Task-number: QTRD-2556

Change-Id: I9ee193141dff6603b47db28b0ed0682db6f914c8
Reviewed-by: Mika Salmela <mika.salmela@digia.com>

4 files changed, 6 insertions, 17 deletions

diff --git a/src/datavisualizationqml2/declarativescatter.cpp b/src/datavisualizationqml2/declarativescatter.cpp
index 1a05c425..b71fb820 100644
--- a/src/datavisualizationqml2/declarativescatter.cpp
+++ b/src/datavisualizationqml2/declarativescatter.cpp
@@ -41,8 +41,6 @@ DeclarativeScatter::DeclarativeScatter(QQuickItem *parent)
     m_shared = new Scatter3DController(boundingRect().toRect());
     setSharedController(m_shared);
 
-    QObject::connect(m_shared, &Scatter3DController::selectedItemIndexChanged, this,
-                     &DeclarativeScatter::selectedItemIndexChanged);
     QObject::connect(m_shared, &Abstract3DController::meshFileNameChanged, this,
                      &DeclarativeScatter::meshFileNameChanged);
 }
@@ -159,16 +157,6 @@ QString DeclarativeScatter::meshFileName() const
     return m_shared->meshFileName();
 }
 
-void DeclarativeScatter::setSelectedItemIndex(int index)
-{
-    m_shared->setSelectedItemIndex(index);
-}
-
-int DeclarativeScatter::selectedItemIndex() const
-{
-    return m_shared->selectedItemIndex();
-}
-
 QQmlListProperty<QScatter3DSeries> DeclarativeScatter::seriesList()
 {
     return QQmlListProperty<QScatter3DSeries>(this, this,
diff --git a/src/datavisualizationqml2/declarativescatter_p.h b/src/datavisualizationqml2/declarativescatter_p.h
index 20455b29..d42c3b23 100644
--- a/src/datavisualizationqml2/declarativescatter_p.h
+++ b/src/datavisualizationqml2/declarativescatter_p.h
@@ -52,7 +52,6 @@ class DeclarativeScatter : public AbstractDeclarative
     Q_PROPERTY(QtDataVisualization::QDataVis::MeshStyle objectType READ objectType WRITE setObjectType NOTIFY meshFileNameChanged)
     Q_PROPERTY(bool objectSmoothingEnabled READ isObjectSmoothingEnabled WRITE setObjectSmoothingEnabled NOTIFY meshFileNameChanged)
     Q_PROPERTY(QString meshFileName READ meshFileName WRITE setMeshFileName NOTIFY meshFileNameChanged)
-    Q_PROPERTY(int selectedItemIndex READ selectedItemIndex WRITE setSelectedItemIndex NOTIFY selectedItemIndexChanged)
     Q_PROPERTY(QQmlListProperty<QScatter3DSeries> seriesList READ seriesList)
     Q_CLASSINFO("DefaultProperty", "seriesList")
 
@@ -78,9 +77,6 @@ public:
     void setMeshFileName(const QString &objFileName);
     QString meshFileName() const;
 
-    void setSelectedItemIndex(int index);
-    int selectedItemIndex() const;
-
     QQmlListProperty<QScatter3DSeries> seriesList();
     static void appendSeriesFunc(QQmlListProperty<QScatter3DSeries> *list, QScatter3DSeries *series);
     static int countSeriesFunc(QQmlListProperty<QScatter3DSeries> *list);
@@ -90,7 +86,6 @@ public:
     Q_INVOKABLE void removeSeries(QScatter3DSeries *series);
 
 signals:
-    void selectedItemIndexChanged(int index);
     void meshFileNameChanged(QString filename);
 
 protected:
diff --git a/src/datavisualizationqml2/declarativeseries.cpp b/src/datavisualizationqml2/declarativeseries.cpp
index 8b7c0584..56601f83 100644
--- a/src/datavisualizationqml2/declarativeseries.cpp
+++ b/src/datavisualizationqml2/declarativeseries.cpp
@@ -57,6 +57,11 @@ QPointF DeclarativeBar3DSeries::selectedBar() const
     return QBar3DSeries::selectedBar();
 }
 
+QPointF DeclarativeBar3DSeries::invalidSelectionPosition() const
+{
+    return QPointF(QBar3DSeries::invalidSelectionPosition());
+}
+
 DeclarativeScatter3DSeries::DeclarativeScatter3DSeries(QObject *parent)
     : QScatter3DSeries(parent)
 {
diff --git a/src/datavisualizationqml2/declarativeseries_p.h b/src/datavisualizationqml2/declarativeseries_p.h
index ac45ec3e..72b7cbcb 100644
--- a/src/datavisualizationqml2/declarativeseries_p.h
+++ b/src/datavisualizationqml2/declarativeseries_p.h
@@ -54,6 +54,7 @@ public:
 
     void setSelectedBar(const QPointF &position);
     QPointF selectedBar() const;
+    Q_INVOKABLE QPointF invalidSelectionPosition() const;
 
 signals:
     void selectedBarChanged(QPointF position);