Fix polar axis title positioning

Task-number: QTRD-3184
Change-Id: I366f41b928e06931784c6ff74e9b6b8a52414e3f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

1 files changed, 20 insertions, 3 deletions

diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp
index f520e279..026795e9 100644
--- a/src/datavisualization/engine/abstract3drenderer.cpp
+++ b/src/datavisualization/engine/abstract3drenderer.cpp
@@ -74,7 +74,8 @@ Abstract3DRenderer::Abstract3DRenderer(Abstract3DController *controller)
       m_xRightAngleRotationNeg(QQuaternion::fromAxisAndAngle(1.0f, 0.0f, 0.0f, -90.0f)),
       m_yRightAngleRotationNeg(QQuaternion::fromAxisAndAngle(0.0f, 1.0f, 0.0f, -90.0f)),
       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_xFlipRotation(QQuaternion::fromAxisAndAngle(1.0f, 0.0f, 0.0f, -180.0f)),
+      m_zFlipRotation(QQuaternion::fromAxisAndAngle(0.0f, 0.0f, 1.0f, -180.0f))
 {
     QObject::connect(m_drawer, &Drawer::drawerChanged, this, &Abstract3DRenderer::updateTextures);
     QObject::connect(this, &Abstract3DRenderer::needRender, controller,
@@ -662,10 +663,15 @@ void Abstract3DRenderer::drawAxisTitleX(const QVector3D &labelRotation,
                                         float labelsMaxWidth,
                                         const QMatrix4x4 &viewMatrix,
                                         const QMatrix4x4 &projectionMatrix,
-                                        ShaderHelper *shader)
+                                        ShaderHelper *shader,
+                                        bool radial)
 {
     float scaleFactor = m_drawer->scaledFontSize() / m_axisCacheX.titleItem().size().height();
-    float titleOffset = 2.0f * (labelMargin + (labelsMaxWidth * scaleFactor));
+    float titleOffset;
+    if (radial)
+        titleOffset = -2.0f * (labelMargin + m_drawer->scaledFontSize());
+    else
+        titleOffset = 2.0f * (labelMargin + (labelsMaxWidth * scaleFactor));
     float zRotation = 0.0f;
     float yRotation = 0.0f;
     float xRotation = -90.0f + labelRotation.z();
@@ -712,6 +718,17 @@ void Abstract3DRenderer::drawAxisTitleX(const QVector3D &labelRotation,
         }
     }
 
+    if (radial) {
+        if (m_zFlipped) {
+            titleOffset = -titleOffset;
+        } else {
+            if (m_yFlippedForGrid)
+                alignment = Qt::AlignTop;
+            else
+                alignment = Qt::AlignBottom;
+        }
+    }
+
     if (offsetRotation == 180.0f || offsetRotation == -180.0f)
         offsetRotation = 0.0f;
     QQuaternion offsetRotator = QQuaternion::fromAxisAndAngle(1.0f, 0.0f, 0.0f, offsetRotation);