Fix: Axis titles do not respect title fixed

When a graph is rotated so that it is viewed from
below the y axis gets flipped. However, x and z
axis were not rotated correctly which caused them
to be unvisible.

Pick-to: 6.1
Fixes: QTBUG-94441
Change-Id: Ic56b910ce790526fd0460aa895ce978e6efd0b23
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>

1 files changed, 20 insertions, 0 deletions

diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp
index 54487ba1..9b8bc13a 100644
--- a/src/datavisualization/engine/abstract3drenderer.cpp
+++ b/src/datavisualization/engine/abstract3drenderer.cpp
@@ -941,12 +941,27 @@ void Abstract3DRenderer::drawAxisTitleX(const QVector3D &labelRotation,
                 xRotation = -90.0f - labelRotation.z();
                 extraRotation = -extraRotation;
             }
+            if (m_yFlipped) {
+                alignment = Qt::AlignBottom;
+                extraRotation = -extraRotation;
+                if (m_xFlipped)
+                    xRotation = 90.0f + labelRotation.z();
+                else
+                    xRotation = 90.0f - labelRotation.z();
+            }
         } else {
             if (m_xFlipped) {
                 offsetRotation = -offsetRotation;
                 xRotation = -90.0f - labelRotation.z();
                 extraRotation = -extraRotation;
             }
+            if (m_yFlipped) {
+                xRotation = 90.0f + labelRotation.z();
+                alignment = Qt::AlignBottom;
+                extraRotation = -extraRotation;
+                if (m_xFlipped)
+                    xRotation = 90.0f - labelRotation.z();
+            }
         }
     }
 
@@ -1038,6 +1053,11 @@ void Abstract3DRenderer::drawAxisTitleZ(const QVector3D &labelRotation,
                 yRotation = -yRotation;
             }
         }
+        if (m_yFlipped) {
+            xRotation = -xRotation;
+            alignment = Qt::AlignBottom;
+            extraRotation = -extraRotation;
+        }
     }
 
     float offsetRotation = zRotation;