Bug fix

If rotation is enabled while in slice view, label ordering was flipped
incorrectly with the main scene rotation.

Change-Id: Icfe8f2163322d753206849304894a3c841aa5f67
Change-Id: Icfe8f2163322d753206849304894a3c841aa5f67
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

1 files changed, 3 insertions, 8 deletions

diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp
index 387f8530..53c5cf6e 100644
--- a/src/datavisualization/engine/bars3drenderer.cpp
+++ b/src/datavisualization/engine/bars3drenderer.cpp
@@ -378,18 +378,13 @@ void Bars3DRenderer::drawSlicedScene(const LabelItem &xLabel,
         // Draw labels
         if (m_sliceCache->labelItems().size() > col) {
             const LabelItem *labelItem(0);
-            // If draw order of bars is flipped, label draw order should be too
-            if (m_xFlipped) {
-                labelItem = m_sliceCache->labelItems().at(
-                            m_sliceCache->labelItems().size() - col - 1);
-            } else {
-                labelItem = m_sliceCache->labelItems().at(col);
-            }
+            labelItem = m_sliceCache->labelItems().at(col);
             m_drawer->drawLabel(*item, *labelItem, viewMatrix, projectionMatrix,
                                 QVector3D(0.0f, m_yAdjustment, zComp),
                                 QVector3D(0.0f, 0.0f, -45.0f), item->height(),
                                 m_cachedSelectionMode, m_labelShader,
-                                m_labelObj, m_cachedScene->camera(), false, false, Drawer::LabelBelow);
+                                m_labelObj, m_cachedScene->camera(), false, false,
+                                Drawer::LabelBelow);
         }
     }