From cc22cc40e889b5b2f0e49ce32f660395cef865b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kera=CC=88nen=20Pasi?= Date: Tue, 12 Nov 2013 09:24:56 +0200 Subject: Changes scene to be proxy for input position and selection communication. Change-Id: I83729508c8a0281569be5f43791d44d36d800ca2 Reviewed-by: Miikka Heikkinen --- src/datavisualization/engine/abstract3drenderer_p.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/datavisualization/engine/abstract3drenderer_p.h') diff --git a/src/datavisualization/engine/abstract3drenderer_p.h b/src/datavisualization/engine/abstract3drenderer_p.h index 3c833956..24d42e37 100644 --- a/src/datavisualization/engine/abstract3drenderer_p.h +++ b/src/datavisualization/engine/abstract3drenderer_p.h @@ -51,6 +51,13 @@ class Abstract3DRenderer : public QObject, protected QOpenGLFunctions Q_OBJECT protected: + enum SelectionState { + SelectNone = 0, + SelectOnScene, + SelectOnOverview, + SelectOnSlice + }; + bool m_hasNegativeValues; Theme m_cachedTheme; QFont m_cachedFont; @@ -85,7 +92,7 @@ protected: Q3DScene *m_cachedScene; bool m_selectionDirty; - QDataVis::InputState m_inputState; + SelectionState m_selectionState; QPoint m_inputPosition; #ifdef DISPLAY_RENDER_SPEED @@ -117,7 +124,7 @@ public: virtual QString itemLabelFormat() const; virtual void updateTextures() = 0; virtual void initSelectionBuffer() = 0; - virtual void updateInputState(QDataVis::InputState state); + virtual void updateSelectionState(SelectionState state); virtual void updateInputPosition(const QPoint &position); #if !defined(QT_OPENGL_ES_2) -- cgit v1.2.3