From 61c3fd4de5f6af2906374f5f3c26032bc12450b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Korpip=C3=A4=C3=A4=20Tomi?= Date: Tue, 18 Mar 2014 11:14:10 +0200 Subject: Fixed bars slice label problem with grid off Task-number: QTRD-2950 Change-Id: Icab3ed5279c671b57921f93c9ffef7efff2da204 Reviewed-by: Miikka Heikkinen --- src/datavisualization/engine/bars3drenderer.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp index 78d80e47..a7f9e2b3 100644 --- a/src/datavisualization/engine/bars3drenderer.cpp +++ b/src/datavisualization/engine/bars3drenderer.cpp @@ -324,6 +324,10 @@ void Bars3DRenderer::drawSlicedScene() GLfloat barPosYAdjustment = -0.8f; // Translate to -1.0 + 0.2 for row/column labels GLfloat scaleFactor = 0.0f; + if (rowMode) + scaleFactor = (1.1f * m_rowWidth) / m_scaleFactor; + else + scaleFactor = (1.1f * m_columnDepth) / m_scaleFactor; GLfloat barLabelYPos = barPosYAdjustment - 0.4f - labelMargin; // 0.4 for labels GLfloat zeroPosAdjustment = 0.0f; if (!m_noZeroInRange) @@ -348,11 +352,6 @@ void Bars3DRenderer::drawSlicedScene() lineShader->setUniformValue(lineShader->lightS(), 0.0f); lineShader->setUniformValue(lineShader->lightColor(), lightColor); - if (rowMode) - scaleFactor = (1.1f * m_rowWidth) / m_scaleFactor; - else - scaleFactor = (1.1f * m_columnDepth) / m_scaleFactor; - GLfloat gridStep = (2.0f * m_axisCacheY.subSegmentStep()) / m_heightNormalizer; GLfloat gridPos = barPosYAdjustment; int lastSegment = m_axisCacheY.subSegmentCount() * m_axisCacheY.segmentCount(); -- cgit v1.2.3