diff options
Diffstat (limited to 'src/datavisualization/input/qabstract3dinputhandler.h')
-rw-r--r-- | src/datavisualization/input/qabstract3dinputhandler.h | 17 |
1 files changed, 14 insertions, 3 deletions
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: |