Merge pull request #14728 from anntzer/more-floating_axes

QuLogic · web-flow · commit 8e129df5ce8d · 2019-07-17T18:24:32.000-04:00
More floating_axes cleanup.
diff --git a/lib/mpl_toolkits/axisartist/axis_artist.py b/lib/mpl_toolkits/axisartist/axis_artist.py
@@ -1006,7 +1006,7 @@ def _update_ticks(self, renderer):
             self.major_ticklabels._set_external_pad(0)
             self.minor_ticklabels._set_external_pad(0)
 
-        majortick_iter,  minortick_iter = \
+        majortick_iter, minortick_iter = \
             self._axis_artist_helper.get_tick_iterators(self.axes)
 
         tick_loc_angle, ticklabel_loc_angle_label = \
@@ -1054,7 +1054,7 @@ def _draw_ticks2(self, renderer):
             self.major_ticklabels._set_external_pad(0)
             self.minor_ticklabels._set_external_pad(0)
 
-        majortick_iter,  minortick_iter = \
+        majortick_iter, minortick_iter = \
             self._axis_artist_helper.get_tick_iterators(self.axes)
 
         tick_loc_angle, ticklabel_loc_angle_label = \
diff --git a/lib/mpl_toolkits/axisartist/floating_axes.py b/lib/mpl_toolkits/axisartist/floating_axes.py
@@ -70,26 +70,19 @@ def get_tick_iterators(self, axes):
             xx0 = lon_levs
             dx = 0.001
 
-        _extremes = self.grid_helper._extremes
-        xmin, xmax = sorted(_extremes[:2])
-        ymin, ymax = sorted(_extremes[2:])
-        if self.nth_coord == 0:
-            mask = (ymin <= yy0) & (yy0 <= ymax)
-            yy0 = yy0[mask]
-        elif self.nth_coord == 1:
-            mask = (xmin <= xx0) & (xx0 <= xmax)
-            xx0 = xx0[mask]
+        extremes = self.grid_helper._extremes
+        xmin, xmax = sorted(extremes[:2])
+        ymin, ymax = sorted(extremes[2:])
 
         def transform_xy(x, y):
             x1, y1 = grid_finder.transform_xy(x, y)
-            x2y2 = axes.transData.transform(np.array([x1, y1]).transpose())
-            x2, y2 = x2y2.transpose()
+            x2, y2 = axes.transData.transform(np.array([x1, y1]).T).T
             return x2, y2
 
-        # find angles
         if self.nth_coord == 0:
+            mask = (ymin <= yy0) & (yy0 <= ymax)
+            yy0 = yy0[mask]
             xx0 = np.full_like(yy0, self.value)
-
             xx1, yy1 = transform_xy(xx0, yy0)
 
             xx00 = xx0.astype(float, copy=True)
@@ -106,8 +99,9 @@ def transform_xy(x, y):
             labels = [l for l, m in zip(labels, mask) if m]
 
         elif self.nth_coord == 1:
+            mask = (xmin <= xx0) & (xx0 <= xmax)
+            xx0 = xx0[mask]
             yy0 = np.full_like(xx0, self.value)
-
             xx1, yy1 = transform_xy(xx0, yy0)
 
             yy00 = yy0.astype(float, copy=True)
