From 91745c4b2f7933dfcb0c9eca28e87ad0fae93e66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kera=CC=88nen=20Pasi?= Date: Tue, 5 Nov 2013 09:58:44 +0200 Subject: Add configurable main and slice view ordering. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I9f5d7399d60971c782fa8ac6fc39a05fa3bbcaa8 Reviewed-by: Tomi Korpipää --- src/datavisualization/engine/bars3drenderer.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src/datavisualization/engine/bars3drenderer.cpp') diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp index 21be9da4..5b4f9fcc 100644 --- a/src/datavisualization/engine/bars3drenderer.cpp +++ b/src/datavisualization/engine/bars3drenderer.cpp @@ -262,12 +262,15 @@ void Bars3DRenderer::render(GLuint defaultFboHandle) // Handle GL state setup for FBO buffers and clearing of the render surface Abstract3DRenderer::render(defaultFboHandle); - // Draw bars scene - drawScene(defaultFboHandle); - - // If slice selection is on, draw the sliced scene - if (m_cachedIsSlicingActivated) - drawSlicedScene(m_axisCacheX.titleItem(), m_axisCacheY.titleItem(), m_axisCacheZ.titleItem()); + if (m_cachedScene->isSecondarySubviewOnTop()) { + drawScene(defaultFboHandle); + if (m_cachedIsSlicingActivated) + drawSlicedScene(m_axisCacheX.titleItem(), m_axisCacheY.titleItem(), m_axisCacheZ.titleItem()); + } else { + if (m_cachedIsSlicingActivated) + drawSlicedScene(m_axisCacheX.titleItem(), m_axisCacheY.titleItem(), m_axisCacheZ.titleItem()); + drawScene(defaultFboHandle); + } } void Bars3DRenderer::drawSlicedScene(const LabelItem &xLabel, -- cgit v1.2.3