Pinch-zoom and double-click selection fixed on Android

Task-number: QTRD-2237

Press-and-hold selection doesn't work. This can be handled as an optional
selection mode after input api task is done.

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

6 files changed, 57 insertions, 6 deletions

diff --git a/src/datavis3dqml2/declarativebars.cpp b/src/datavis3dqml2/declarativebars.cpp
index 91da8f64..5210990d 100644
--- a/src/datavis3dqml2/declarativebars.cpp
+++ b/src/datavis3dqml2/declarativebars.cpp
@@ -63,12 +63,12 @@ void DeclarativeBars::handleShadowQualityUpdate(QDataVis::ShadowQuality quality)
 
 void DeclarativeBars::classBegin()
 {
-    qDebug() << "classBegin";
+    //qDebug() << "classBegin";
 }
 
 void DeclarativeBars::componentComplete()
 {
-    qDebug() << "componentComplete";
+    //qDebug() << "componentComplete";
 }
 
 QSGNode *DeclarativeBars::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
@@ -365,6 +365,21 @@ QPoint DeclarativeBars::selectedBarPos() const
     return m_shared->selectedBarPos();
 }
 
+void DeclarativeBars::mouseDoubleClickEvent(QMouseEvent *event)
+{
+#if defined(Q_OS_ANDROID)
+    m_shared->mouseDoubleClickEvent(event);
+#endif
+}
+
+void DeclarativeBars::touchEvent(QTouchEvent *event)
+{
+#if defined(Q_OS_ANDROID)
+    m_shared->touchEvent(event);
+    update();
+#endif
+}
+
 void DeclarativeBars::mousePressEvent(QMouseEvent *event)
 {
     QPoint mousePos = event->pos();
diff --git a/src/datavis3dqml2/declarativebars_p.h b/src/datavis3dqml2/declarativebars_p.h
index 2cbd24e0..9ce15110 100644
--- a/src/datavis3dqml2/declarativebars_p.h
+++ b/src/datavis3dqml2/declarativebars_p.h
@@ -194,6 +194,8 @@ protected:
 
     QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *);
 
+    void mouseDoubleClickEvent(QMouseEvent *event);
+    void touchEvent(QTouchEvent *event);
     void mousePressEvent(QMouseEvent *event);
     void mouseReleaseEvent(QMouseEvent *event);
     void mouseMoveEvent(QMouseEvent *event);
diff --git a/src/datavis3dqml2/declarativemaps.cpp b/src/datavis3dqml2/declarativemaps.cpp
index a0e1c927..f90eadd4 100644
--- a/src/datavis3dqml2/declarativemaps.cpp
+++ b/src/datavis3dqml2/declarativemaps.cpp
@@ -42,12 +42,12 @@ DeclarativeMaps::~DeclarativeMaps()
 
 void DeclarativeMaps::classBegin()
 {
-    qDebug() << "classBegin";
+    //qDebug() << "classBegin";
 }
 
 void DeclarativeMaps::componentComplete()
 {
-    qDebug() << "componentComplete";
+    //qDebug() << "componentComplete";
 }
 
 QSGNode *DeclarativeMaps::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
@@ -190,6 +190,21 @@ void DeclarativeMaps::setMapping(QItemModelMapDataMapping *mapping)
     static_cast<QItemModelMapDataProxy *>(m_shared->dataProxy())->setMapping(mapping);
 }
 
+void DeclarativeMaps::mouseDoubleClickEvent(QMouseEvent *event)
+{
+#if defined(Q_OS_ANDROID)
+    m_shared->mouseDoubleClickEvent(event);
+#endif
+}
+
+void DeclarativeMaps::touchEvent(QTouchEvent *event)
+{
+#if defined(Q_OS_ANDROID)
+    m_shared->touchEvent(event);
+    update();
+#endif
+}
+
 void DeclarativeMaps::mousePressEvent(QMouseEvent *event)
 {
     QPoint mousePos = event->pos();
diff --git a/src/datavis3dqml2/declarativemaps_p.h b/src/datavis3dqml2/declarativemaps_p.h
index ef276571..8cc43b50 100644
--- a/src/datavis3dqml2/declarativemaps_p.h
+++ b/src/datavis3dqml2/declarativemaps_p.h
@@ -121,6 +121,8 @@ protected:
 
     QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *);
 
+    void mouseDoubleClickEvent(QMouseEvent *event);
+    void touchEvent(QTouchEvent *event);
     void mousePressEvent(QMouseEvent *event);
     void mouseReleaseEvent(QMouseEvent *event);
     void mouseMoveEvent(QMouseEvent *event);
diff --git a/src/datavis3dqml2/declarativescatter.cpp b/src/datavis3dqml2/declarativescatter.cpp
index 2a7610c2..c0a2401b 100644
--- a/src/datavis3dqml2/declarativescatter.cpp
+++ b/src/datavis3dqml2/declarativescatter.cpp
@@ -58,12 +58,12 @@ void DeclarativeScatter::handleShadowQualityUpdate(QDataVis::ShadowQuality quali
 
 void DeclarativeScatter::classBegin()
 {
-    qDebug() << "classBegin";
+    //qDebug() << "classBegin";
 }
 
 void DeclarativeScatter::componentComplete()
 {
-    qDebug() << "componentComplete";
+    //qDebug() << "componentComplete";
 }
 
 QSGNode *DeclarativeScatter::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
@@ -299,6 +299,21 @@ QString DeclarativeScatter::itemLabelFormat()
     return m_shared->activeDataProxy()->itemLabelFormat();
 }
 
+void DeclarativeScatter::mouseDoubleClickEvent(QMouseEvent *event)
+{
+#if defined(Q_OS_ANDROID)
+    m_shared->mouseDoubleClickEvent(event);
+#endif
+}
+
+void DeclarativeScatter::touchEvent(QTouchEvent *event)
+{
+#if defined(Q_OS_ANDROID)
+    m_shared->touchEvent(event);
+    update();
+#endif
+}
+
 void DeclarativeScatter::mousePressEvent(QMouseEvent *event)
 {
     QPoint mousePos = event->pos();
diff --git a/src/datavis3dqml2/declarativescatter_p.h b/src/datavis3dqml2/declarativescatter_p.h
index cb47d71a..dc538add 100644
--- a/src/datavis3dqml2/declarativescatter_p.h
+++ b/src/datavis3dqml2/declarativescatter_p.h
@@ -157,6 +157,8 @@ protected:
     // Used to detect when shadow quality changes autonomously due to e.g. resizing.
     void handleShadowQualityUpdate(QDataVis::ShadowQuality quality);
 
+    void mouseDoubleClickEvent(QMouseEvent *event);
+    void touchEvent(QTouchEvent *event);
     void mousePressEvent(QMouseEvent *event);
     void mouseReleaseEvent(QMouseEvent *event);
     void mouseMoveEvent(QMouseEvent *event);