diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-09-29 15:14:25 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-09-30 10:08:14 +0300 |
| commit | 6821c16e36a7454627ac9a18cd1d8b0f0bd9246f (patch) | |
| tree | c2b1197792f511dc53393fc8372fc2bc0852a958 /src/datavisualization/engine/abstract3drenderer.cpp | |
| parent | 084010113485262ad4495e0af2d57ad3aa0fcf7e (diff) | |
Make background margin configurable
Added margin as abstract graph property.
If the margin is narrow, the positions of theedge labels of the axes
are adjusted to avoid overlap with edge labels on other axes.
Task-number: QTRD-3204
Change-Id: I7fa5a04c8f2091519d99689ef2f6cbcf799fb15e
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/engine/abstract3drenderer.cpp')
| -rw-r--r-- | src/datavisualization/engine/abstract3drenderer.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp index ab086b5f..aaf5418f 100644 --- a/src/datavisualization/engine/abstract3drenderer.cpp +++ b/src/datavisualization/engine/abstract3drenderer.cpp @@ -92,8 +92,12 @@ Abstract3DRenderer::Abstract3DRenderer(Abstract3DController *controller) m_zRightAngleRotationNeg(QQuaternion::fromAxisAndAngle(0.0f, 0.0f, 1.0f, -90.0f)), m_xFlipRotation(QQuaternion::fromAxisAndAngle(1.0f, 0.0f, 0.0f, -180.0f)), m_zFlipRotation(QQuaternion::fromAxisAndAngle(0.0f, 0.0f, 1.0f, -180.0f)), + m_requestedMargin(-1.0f), m_vBackgroundMargin(0.1f), m_hBackgroundMargin(0.1f), + m_scaleXWithBackground(0.0f), + m_scaleYWithBackground(0.0f), + m_scaleZWithBackground(0.0f), m_oldCameraTarget(QVector3D(2000.0f, 2000.0f, 2000.0f)), // Just random invalid target m_reflectionEnabled(false), m_reflectivity(0.5) @@ -459,6 +463,11 @@ void Abstract3DRenderer::updateRadialLabelOffset(float offset) m_radialLabelOffset = offset; } +void Abstract3DRenderer::updateMargin(float margin) +{ + m_requestedMargin = margin; +} + void Abstract3DRenderer::updateOptimizationHint(QAbstract3DGraph::OptimizationHints hint) { m_cachedOptimizationHint = hint; |