Backport PR #28261: Correct roll angle units, issue #28256

oscargus · LorenzoPeri17 · commit cb58073ce874 · 2024-07-18T10:23:02.000+01:00
diff --git a/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py b/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py
@@ -1836,6 +1836,7 @@ def test_shared_axes_retick():
     assert ax2.get_zlim() == (-0.5, 2.5)
 
 
+<<<<<<< HEAD
 def test_quaternion():
     # 1:
     q1 = Quaternion(1, [0, 0, 0])
@@ -1941,22 +1942,42 @@ def test_rotate():
             [30, 0, 0.5, -60, -90, 90],
             [0, 0.5, 0.5, -45, -90, 45],
             [30, 0.5, 0.5, -15, -90, 45]]:
+=======
+def test_rotate():
+    """Test rotating using the left mouse button."""
+    for roll in [0, 30]:
+>>>>>>> 042e1bb7f9 (Backport PR #28261: Correct roll angle units, issue #28256)
         fig = plt.figure()
         ax = fig.add_subplot(1, 1, 1, projection='3d')
         ax.view_init(0, 0, roll)
         ax.figure.canvas.draw()
 
+<<<<<<< HEAD
         # drag mouse to change orientation
+=======
+        # drag mouse horizontally to change azimuth
+        dx = 0.1
+        dy = 0.2
+>>>>>>> 042e1bb7f9 (Backport PR #28261: Correct roll angle units, issue #28256)
         ax._button_press(
             mock_event(ax, button=MouseButton.LEFT, xdata=0, ydata=0))
         ax._on_move(
             mock_event(ax, button=MouseButton.LEFT,
                            xdata=dx*ax._pseudo_w, ydata=dy*ax._pseudo_h))
         ax.figure.canvas.draw()
+<<<<<<< HEAD
 
         assert np.isclose(ax.elev, new_elev)
         assert np.isclose(ax.azim, new_azim)
         assert np.isclose(ax.roll, new_roll)
+=======
+        roll_radians = np.deg2rad(ax.roll)
+        cs = np.cos(roll_radians)
+        sn = np.sin(roll_radians)
+        assert ax.elev == (-dy*180*cs + dx*180*sn)
+        assert ax.azim == (-dy*180*sn - dx*180*cs)
+        assert ax.roll == roll
+>>>>>>> 042e1bb7f9 (Backport PR #28261: Correct roll angle units, issue #28256)
 
 
 def test_pan():
