Merge pull request #17235 from anntzer/aa

tacaswell · web-flow · commit c5386a3ef259 · 2020-04-27T19:11:17.000-04:00
MNT/API: More axisartist cleanups
diff --git a/lib/mpl_toolkits/axisartist/axis_artist.py b/lib/mpl_toolkits/axisartist/axis_artist.py
@@ -362,10 +362,10 @@ class AxisLabel(AttributeCopier, LabelBase):
 
     def __init__(self, *args, axis_direction="bottom", axis=None, **kwargs):
         self._axis = axis
-        LabelBase.__init__(self, *args, **kwargs)
-        self.set_axis_direction(axis_direction)
         self._pad = 5
         self._extra_pad = 0
+        LabelBase.__init__(self, *args, **kwargs)
+        self.set_axis_direction(axis_direction)
 
     def set_pad(self, pad):
         """
@@ -691,7 +691,7 @@ class AxisArtist(martist.Artist):
     is constant) line, ticks, ticklabels, and axis label.
     """
 
-    ZORDER = 2.5
+    zorder = ZORDER = 2.5  # ZORDER is a backcompat alias.
 
     @property
     def LABELPAD(self):
@@ -728,26 +728,19 @@ def __init__(self, axes,
             + self.axes.figure.dpi_scale_trans)
 
         if axis_direction in ["left", "right"]:
-            axis_name = "ytick"
             self.axis = axes.yaxis
         else:
-            axis_name = "xtick"
             self.axis = axes.xaxis
 
         self._axisline_style = None
         self._axis_direction = axis_direction
 
         self._init_line()
-        self._init_ticks(axis_name, **kwargs)
+        self._init_ticks(**kwargs)
         self._init_offsetText(axis_direction)
         self._init_label()
 
-        self.set_zorder(self.ZORDER)
-
-        self._rotate_label_along_line = False
-
         # axis direction
-        self._tick_add_angle = 180.
         self._ticklabel_add_angle = 0.
         self._axislabel_add_angle = 0.
         self.set_axis_direction(axis_direction)
@@ -899,46 +892,40 @@ def _draw_line(self, renderer):
             self.line.set_line_mutation_scale(self.major_ticklabels.get_size())
         self.line.draw(renderer)
 
-    def _init_ticks(self, axis_name, **kwargs):
+    def _init_ticks(self, **kwargs):
+        axis_name = self.axis.axis_name
 
         trans = (self._axis_artist_helper.get_tick_transform(self.axes)
                  + self.offset_transform)
 
-        major_tick_size = kwargs.get("major_tick_size",
-                                     rcParams[f'{axis_name}.major.size'])
-        major_tick_pad = kwargs.get("major_tick_pad",
-                                    rcParams[f'{axis_name}.major.pad'])
-        minor_tick_size = kwargs.get("minor_tick_size",
-                                     rcParams[f'{axis_name}.minor.size'])
-        minor_tick_pad = kwargs.get("minor_tick_pad",
-                                    rcParams[f'{axis_name}.minor.pad'])
-
-        self.major_ticks = Ticks(major_tick_size,
-                                 axis=self.axis,
-                                 transform=trans)
-        self.minor_ticks = Ticks(minor_tick_size,
-                                 axis=self.axis,
-                                 transform=trans)
-
-        if axis_name == "xaxis":
-            size = rcParams['xtick.labelsize']
-        else:
-            size = rcParams['ytick.labelsize']
-
-        self.major_ticklabels = TickLabels(size=size, axis=self.axis,
-                                           axis_direction=self._axis_direction)
-        self.minor_ticklabels = TickLabels(size=size, axis=self.axis,
-                                           axis_direction=self._axis_direction)
-
-        self.major_ticklabels.set(figure=self.axes.figure,
-                                  transform=trans,
-                                  fontsize=size)
-        self.major_ticklabels.set_pad(major_tick_pad)
-
-        self.minor_ticklabels.set(figure=self.axes.figure,
-                                  transform=trans,
-                                  fontsize=size)
-        self.minor_ticklabels.set_pad(minor_tick_pad)
+        self.major_ticks = Ticks(
+            kwargs.get(
+                "major_tick_size", rcParams[f"{axis_name}tick.major.size"]),
+            axis=self.axis, transform=trans)
+        self.minor_ticks = Ticks(
+            kwargs.get(
+                "minor_tick_size", rcParams[f"{axis_name}tick.minor.size"]),
+            axis=self.axis, transform=trans)
+
+        size = rcParams[f"{axis_name}tick.labelsize"]
+        self.major_ticklabels = TickLabels(
+            axis=self.axis,
+            axis_direction=self._axis_direction,
+            figure=self.axes.figure,
+            transform=trans,
+            fontsize=size,
+            pad=kwargs.get(
+                "major_tick_pad", rcParams[f"{axis_name}tick.major.pad"]),
+        )
+        self.minor_ticklabels = TickLabels(
+            axis=self.axis,
+            axis_direction=self._axis_direction,
+            figure=self.axes.figure,
+            transform=trans,
+            fontsize=size,
+            pad=kwargs.get(
+                "minor_tick_pad", rcParams[f"{axis_name}tick.minor.pad"]),
+        )
 
     def _get_tick_info(self, tick_iter):
         """
diff --git a/lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py b/lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py
@@ -361,9 +361,6 @@ def new_floating_axis(self, nth_coord,
         # axisline.major_ticklabels.set_visible(True)
         # axisline.minor_ticklabels.set_visible(False)
 
-        # axisline.major_ticklabels.set_rotate_along_line(True)
-        # axisline.set_rotate_label_along_line(True)
-
         return axisline
 
     def _update_grid(self, x1, y1, x2, y2):
