diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-03-27 14:26:07 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-03-28 07:47:21 +0200 |
| commit | fffa26dc1470ad6562e390133314fc149134b8e5 (patch) | |
| tree | 425aa473c79671bd48111a12e5a94ad62e68bb53 /src/datavisualization/engine | |
| parent | 1e99ff2c532977d21776f5f363b8171ef147a7d9 (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')
| -rw-r--r-- | src/datavisualization/engine/bars3drenderer.cpp | 4 | ||||
| -rw-r--r-- | src/datavisualization/engine/scatter3drenderer.cpp | 6 | ||||
| -rw-r--r-- | src/datavisualization/engine/surface3drenderer.cpp | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp index 0cad8522..b928e5f0 100644 --- a/src/datavisualization/engine/bars3drenderer.cpp +++ b/src/datavisualization/engine/bars3drenderer.cpp @@ -434,7 +434,7 @@ void Bars3DRenderer::drawSlicedScene() // Draw grid labels int labelNbr = 0; - int labelCount = m_axisCacheY.labels().size(); + int labelCount = m_axisCacheY.labelCount(); QVector3D backLabelRotation(0.0f, 0.0f, 0.0f); QVector3D labelTrans = QVector3D(scaleFactor + labelMargin, 0.0f, 0.0f); @@ -1665,7 +1665,7 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle) // Y Labels int labelNbr = 0; - int labelCount = m_axisCacheY.labels().size(); + int labelCount = m_axisCacheY.labelCount(); GLfloat labelMarginXTrans = labelMargin; GLfloat labelMarginZTrans = labelMargin; GLfloat labelXTrans = rowScaleFactor; diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp index 49595052..909d434f 100644 --- a/src/datavisualization/engine/scatter3drenderer.cpp +++ b/src/datavisualization/engine/scatter3drenderer.cpp @@ -1262,7 +1262,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle) // Z Labels if (m_axisCacheZ.segmentCount() > 0) { - int labelCount = m_axisCacheZ.labelItems().size(); + int labelCount = m_axisCacheZ.labelCount(); #ifndef USE_UNIFORM_SCALING GLfloat labelXTrans = (aspectRatio * m_areaSize.width()) / m_scaleFactor + labelMargin + m_backgroundMargin; @@ -1310,7 +1310,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle) } // X Labels if (m_axisCacheX.segmentCount() > 0) { - int labelCount = m_axisCacheX.labelItems().size(); + int labelCount = m_axisCacheX.labelCount(); #ifndef USE_UNIFORM_SCALING GLfloat labelZTrans = (aspectRatio * m_areaSize.height()) / m_scaleFactor + labelMargin + m_backgroundMargin; @@ -1358,7 +1358,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle) } // Y Labels if (m_axisCacheY.segmentCount() > 0) { - int labelCount = m_axisCacheY.labelItems().size(); + int labelCount = m_axisCacheY.labelCount(); int labelNbr = 0; #ifndef USE_UNIFORM_SCALING // Use this if we want to use autoscaling for x and z GLfloat labelXTrans = (aspectRatio* m_areaSize.width()) 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; |