diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-02 13:14:16 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-02 13:14:35 +0300 |
| commit | 50da1dc9f6cc6a276c603508868dd7f9d4c7913d (patch) | |
| tree | ba5b78cc2187709f33ccc6da9d7581c7f63729f6 /src/datavisualization/engine/bars3drenderer.cpp | |
| parent | 0b1c5c06a188a9dc22820e289b3ef9d6589a0df9 (diff) | |
Refactored MeshStyle and InputState
Task-number: QTRD-2362
Change-Id: I52ad876b9658a4a9f9a79a6358e68323075bd6c9
Change-Id: I52ad876b9658a4a9f9a79a6358e68323075bd6c9
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/engine/bars3drenderer.cpp')
| -rw-r--r-- | src/datavisualization/engine/bars3drenderer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp index 8274675d..2649fe85 100644 --- a/src/datavisualization/engine/bars3drenderer.cpp +++ b/src/datavisualization/engine/bars3drenderer.cpp @@ -712,7 +712,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle) glEnable(GL_DITHER); // Read color under cursor - if (QDataVis::InputOnScene == m_controller->inputState()) { + if (QDataVis::InputStateOnScene == m_controller->inputState()) { m_selection = Utils::getSelection(m_controller->inputPosition(), m_cachedBoundingRect.height()); } @@ -749,7 +749,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle) bool selectionDirty = (m_selection != m_previousSelection || (m_selection != selectionSkipColor - && QDataVis::InputOnScene == m_controller->inputState() + && QDataVis::InputStateOnScene == m_controller->inputState() && !m_cachedIsSlicingActivated)); if (selectionDirty) { m_previousSelection = m_selection; @@ -1388,7 +1388,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle) m_selectedBar = NULL; if (m_cachedIsSlicingActivated && (m_selection == selectionSkipColor - || QDataVis::InputOnOverview == m_controller->inputState())) { + || QDataVis::InputStateOnOverview == m_controller->inputState())) { m_cachedScene->setSlicingActive(false); } } else if (m_cachedSelectionMode >= QDataVis::SelectionModeSliceRow && selectionDirty) { |