Add configurable main and slice view ordering.

Change-Id: I9f5d7399d60971c782fa8ac6fc39a05fa3bbcaa8
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

1 files changed, 9 insertions, 6 deletions

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,