From 1b1dfcaadf83c73d3f7c1c1cd893894a3aea0ecb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= <tomi.korpipaa@digia.com>
Date: Tue, 21 Jan 2014 12:01:27 +0200
Subject: InputState enum divided

Task-number: QTRD-2683

Change-Id: Ib05469ac1bf8c8ed828974a3adb91ecb5f8f1fc9
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
---
 src/datavisualization/input/qabstract3dinputhandler.h | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'src/datavisualization/input/qabstract3dinputhandler.h')

diff --git a/src/datavisualization/input/qabstract3dinputhandler.h b/src/datavisualization/input/qabstract3dinputhandler.h
index f8b8ba88..47ae9e1c 100644
--- a/src/datavisualization/input/qabstract3dinputhandler.h
+++ b/src/datavisualization/input/qabstract3dinputhandler.h
@@ -30,20 +30,26 @@ class QT_DATAVISUALIZATION_EXPORT QAbstract3DInputHandler : public QObject
 {
     Q_OBJECT
     Q_ENUMS(InputState)
+    Q_ENUMS(InputView)
     Q_PROPERTY(InputState inputState READ inputState WRITE setInputState NOTIFY inputStateChanged)
+    Q_PROPERTY(InputView inputView READ inputView WRITE setInputView NOTIFY inputViewChanged)
     Q_PROPERTY(QPoint inputPosition READ inputPosition WRITE setInputPosition NOTIFY positionChanged)
     Q_PROPERTY(Q3DScene *scene READ scene WRITE setScene NOTIFY sceneChanged)
 
 public:
     enum InputState {
         InputStateNone = 0,
-        InputStateOnScene,
-        InputStateOnPrimaryView,
-        InputStateOnSecondaryView,
+        InputStateSelecting,
         InputStateRotating,
         InputStatePinching
     };
 
+    enum InputView {
+        InputViewNone = 0,
+        InputViewOnPrimary,
+        InputViewOnSecondary
+    };
+
 public:
     explicit QAbstract3DInputHandler(QObject *parent = 0);
     virtual ~QAbstract3DInputHandler();
@@ -61,6 +67,10 @@ public:
     InputState inputState();
     void setInputState(InputState inputState);
 
+    // TODO: Check if the inputView needs to be visible outside of subclasses in the final architecture
+    InputView inputView();
+    void setInputView(InputView inputView);
+
     QPoint inputPosition() const;
     void setInputPosition(const QPoint &position);
 
@@ -70,6 +80,7 @@ public:
 signals:
     void positionChanged(QPoint position);
     void inputStateChanged(InputState state);
+    void inputViewChanged(InputView view);
     void sceneChanged(const Q3DScene *scene);
 
 protected:
-- 
cgit v1.2.3