Merge pull request #20805 from QuLogic/fix-tick-reset

tacaswell · web-flow · commit c42365833708 · 2021-08-20T12:58:32.000-04:00
FIX: Ensure all params are restored after `reset_ticks`.
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -167,10 +167,12 @@ def __init__(self, axes, loc, *,
             GRIDLINE_INTERPOLATION_STEPS
         self.label1 = mtext.Text(
             np.nan, np.nan,
-            fontsize=labelsize, color=labelcolor, visible=label1On)
+            fontsize=labelsize, color=labelcolor, visible=label1On,
+            rotation=self._labelrotation[1])
         self.label2 = mtext.Text(
             np.nan, np.nan,
-            fontsize=labelsize, color=labelcolor, visible=label2On)
+            fontsize=labelsize, color=labelcolor, visible=label2On,
+            rotation=self._labelrotation[1])
 
         self._apply_tickdir(tickdir)
 
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -4783,6 +4783,26 @@ def test_reset_grid():
         assert ax.xaxis.majorTicks[0].gridline.get_visible()
 
 
+@check_figures_equal(extensions=['png'])
+def test_reset_ticks(fig_test, fig_ref):
+    for fig in [fig_ref, fig_test]:
+        ax = fig.add_subplot()
+        ax.grid(True)
+        ax.tick_params(
+            direction='in', length=10, width=5, color='C0', pad=12,
+            labelsize=14, labelcolor='C1', labelrotation=45,
+            grid_color='C2', grid_alpha=0.8, grid_linewidth=3,
+            grid_linestyle='--')
+        fig.draw_no_output()
+
+    # After we've changed any setting on ticks, reset_ticks will mean
+    # re-creating them from scratch. This *should* appear the same as not
+    # resetting them.
+    for ax in fig_test.axes:
+        ax.xaxis.reset_ticks()
+        ax.yaxis.reset_ticks()
+
+
 def test_vline_limit():
     fig = plt.figure()
     ax = fig.gca()
