Fix polar axis title positioning

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

1 files changed, 21 insertions, 2 deletions

diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp
index 31c3973b..86faca96 100644
--- a/src/datavisualization/engine/scatter3drenderer.cpp
+++ b/src/datavisualization/engine/scatter3drenderer.cpp
@@ -1580,7 +1580,14 @@ void Scatter3DRenderer::drawLabels(bool drawSelection, const Q3DCamera *activeCa
             labelsMaxWidth = qMax(labelsMaxWidth, float(axisLabelItem.size().width()));
         }
         if (!drawSelection && m_axisCacheZ.isTitleVisible()) {
-            labelTrans.setZ(0.0f);
+            if (m_polarGraph) {
+                float titleZ = -m_graphAspectRatio / 2.0f;
+                if (m_zFlipped)
+                    titleZ = -titleZ;
+                labelTrans.setZ(titleZ);
+            } else {
+                labelTrans.setZ(0.0f);
+            }
             drawAxisTitleZ(labelRotation, labelTrans, totalRotation, m_dummyRenderItem,
                            activeCamera, labelsMaxWidth, viewMatrix, projectionMatrix, shader);
         }
@@ -1746,8 +1753,20 @@ void Scatter3DRenderer::drawLabels(bool drawSelection, const Q3DCamera *activeCa
         }
         if (!drawSelection && m_axisCacheX.isTitleVisible()) {
             labelTrans.setX(0.0f);
+            bool radial = false;
+            if (m_polarGraph) {
+                if (m_xFlipped == m_zFlipped)
+                    totalRotation *= m_zRightAngleRotation;
+                else
+                    totalRotation *= m_zRightAngleRotationNeg;
+                if (m_yFlippedForGrid)
+                    totalRotation *= QQuaternion::fromAxisAndAngle(0.0f, 0.0f, 1.0f, -180.0f);
+                labelTrans.setZ(-m_graphAspectRatio);
+                radial = true;
+            }
             drawAxisTitleX(labelRotation, labelTrans, totalRotation, m_dummyRenderItem,
-                           activeCamera, labelsMaxWidth, viewMatrix, projectionMatrix, shader);
+                           activeCamera, labelsMaxWidth, viewMatrix, projectionMatrix, shader,
+                           radial);
         }
     }