Implement zooming to cursor

Zooming to cursor is now default operating mode of
the default input handler.

Task-number: QTRD-3263
Change-Id: I5699fc0ce7393059538972cd52f31f06d87e3d8d
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

3 files changed, 13 insertions, 0 deletions

diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp
index fdfa55d8..9206973a 100644
--- a/src/datavisualizationqml2/abstractdeclarative.cpp
+++ b/src/datavisualizationqml2/abstractdeclarative.cpp
@@ -341,6 +341,8 @@ void AbstractDeclarative::setSharedController(Abstract3DController *controller)
                      &AbstractDeclarative::reflectivityChanged);
     QObject::connect(m_controller.data(), &Abstract3DController::localeChanged, this,
                      &AbstractDeclarative::localeChanged);
+    QObject::connect(m_controller.data(), &Abstract3DController::queriedGraphPositionChanged, this,
+                     &AbstractDeclarative::queriedGraphPositionChanged);
 }
 
 void AbstractDeclarative::activateOpenGLContext(QQuickWindow *window)
@@ -796,6 +798,11 @@ QLocale AbstractDeclarative::locale() const
     return m_controller->locale();
 }
 
+QVector3D AbstractDeclarative::queriedGraphPosition() const
+{
+    return m_controller->queriedGraphPosition();
+}
+
 void AbstractDeclarative::windowDestroyed(QObject *obj)
 {
     // Remove destroyed window from window lists
diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h
index 52a5956b..8dc260c2 100644
--- a/src/datavisualizationqml2/abstractdeclarative_p.h
+++ b/src/datavisualizationqml2/abstractdeclarative_p.h
@@ -78,6 +78,7 @@ class AbstractDeclarative : public QQuickItem
     Q_PROPERTY(bool reflection READ isReflection WRITE setReflection NOTIFY reflectionChanged REVISION 2)
     Q_PROPERTY(qreal reflectivity READ reflectivity WRITE setReflectivity NOTIFY reflectivityChanged REVISION 2)
     Q_PROPERTY(QLocale locale READ locale WRITE setLocale NOTIFY localeChanged REVISION 2)
+    Q_PROPERTY(QVector3D queriedGraphPosition READ queriedGraphPosition NOTIFY queriedGraphPositionChanged REVISION 2)
 
 public:
     enum SelectionFlag {
@@ -217,6 +218,8 @@ public:
     void setLocale(const QLocale &locale);
     QLocale locale() const;
 
+    QVector3D queriedGraphPosition() const;
+
 public slots:
     virtual void handleAxisXChanged(QAbstract3DAxis *axis) = 0;
     virtual void handleAxisYChanged(QAbstract3DAxis *axis) = 0;
@@ -260,6 +263,7 @@ signals:
     Q_REVISION(2) void reflectionChanged(bool enabled);
     Q_REVISION(2) void reflectivityChanged(qreal reflectivity);
     Q_REVISION(2) void localeChanged(const QLocale &locale);
+    Q_REVISION(2) void queriedGraphPositionChanged(const QVector3D &data);
 
 private:
     QPointer<Abstract3DController> m_controller;
diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
index a22fc55c..5aaebf03 100644
--- a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
+++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
@@ -113,6 +113,8 @@ void QtDataVisualizationQml2Plugin::registerTypes(const char *uri)
     // New revisions
     qmlRegisterUncreatableType<AbstractDeclarative, 2>(uri, 1, 2, "AbstractGraph3D",
                                                        QLatin1String("Trying to create uncreatable: AbstractGraph3D."));
+    qmlRegisterUncreatableType<Declarative3DScene, 1>(uri, 1, 2, "Scene3D",
+                                                      QLatin1String("Trying to create uncreatable: Scene3D."));
     qmlRegisterType<DeclarativeSurface, 1>(uri, 1, 2, "Surface3D");
     qmlRegisterType<Q3DCamera, 1>(uri, 1, 2, "Camera3D");
     qmlRegisterType<QCustom3DItem, 1>(uri, 1, 2, "Custom3DItem");