summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine/surface3drenderer.cpp
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2014-03-27 14:26:07 +0200
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2014-03-28 07:47:21 +0200
commitfffa26dc1470ad6562e390133314fc149134b8e5 (patch)
tree425aa473c79671bd48111a12e5a94ad62e68bb53 /src/datavisualization/engine/surface3drenderer.cpp
parent1e99ff2c532977d21776f5f363b8171ef147a7d9 (diff)
Improve axis formatter flexibility
Number of grid lines and labels are no longer tied to segment count. Change-Id: I517ebc905f1f70e2e00ae86c05fd0e49e922845d Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/engine/surface3drenderer.cpp')
-rw-r--r--src/datavisualization/engine/surface3drenderer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp
index 86972fdc..0f9a3f10 100644
--- a/src/datavisualization/engine/surface3drenderer.cpp
+++ b/src/datavisualization/engine/surface3drenderer.cpp
@@ -1739,7 +1739,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
// Z Labels
QVector3D positionZComp(0.0f, 0.0f, 0.0f);
if (m_axisCacheZ.segmentCount() > 0) {
- int labelCount = m_axisCacheZ.labelItems().size();
+ int labelCount = m_axisCacheZ.labelCount();
int labelNbr = 0;
GLfloat labelXTrans = m_scaleXWithBackground + labelMargin;
GLfloat labelYTrans = -backgroundMargin;
@@ -1781,7 +1781,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
}
// X Labels
if (m_axisCacheX.segmentCount() > 0) {
- int labelCount = m_axisCacheX.labelItems().size();
+ int labelCount = m_axisCacheX.labelCount();
int labelNbr = 0;
GLfloat labelZTrans = m_scaleZWithBackground + labelMargin;
@@ -1824,7 +1824,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
}
// Y Labels
if (m_axisCacheY.segmentCount() > 0) {
- int labelCount = m_axisCacheY.labelItems().size();
+ int labelCount = m_axisCacheY.labelCount();
int labelNbr = 0;
GLfloat labelXTrans = m_scaleXWithBackground;