Merge pull request #18588 from anntzer/xyaxis_transform

jklymak · web-flow · commit e3b6798dfbd8 · 2020-09-26T17:11:53.000-07:00
Use get_x/yaxis_transform more.
diff --git a/examples/subplots_axes_and_figures/axes_zoom_effect.py b/examples/subplots_axes_and_figures/axes_zoom_effect.py
@@ -18,21 +18,22 @@ def connect_bbox(bbox1, bbox2,
         prop_patches = {
             **prop_lines,
             "alpha": prop_lines.get("alpha", 1) * 0.2,
+            "clip_on": False,
         }
 
-    c1 = BboxConnector(bbox1, bbox2, loc1=loc1a, loc2=loc2a, **prop_lines)
-    c1.set_clip_on(False)
-    c2 = BboxConnector(bbox1, bbox2, loc1=loc1b, loc2=loc2b, **prop_lines)
-    c2.set_clip_on(False)
+    c1 = BboxConnector(
+        bbox1, bbox2, loc1=loc1a, loc2=loc2a, clip_on=False, **prop_lines)
+    c2 = BboxConnector(
+        bbox1, bbox2, loc1=loc1b, loc2=loc2b, clip_on=False, **prop_lines)
 
     bbox_patch1 = BboxPatch(bbox1, **prop_patches)
     bbox_patch2 = BboxPatch(bbox2, **prop_patches)
 
     p = BboxConnectorPatch(bbox1, bbox2,
                            # loc1a=3, loc2a=2, loc1b=4, loc2b=1,
                            loc1a=loc1a, loc2a=loc2a, loc1b=loc1b, loc2b=loc2b,
+                           clip_on=False,
                            **prop_patches)
-    p.set_clip_on(False)
 
     return c1, c2, bbox_patch1, bbox_patch2, p
 
@@ -54,13 +55,10 @@ def zoom_effect01(ax1, ax2, xmin, xmax, **kwargs):
         Arguments passed to the patch constructor.
     """
 
-    trans1 = blended_transform_factory(ax1.transData, ax1.transAxes)
-    trans2 = blended_transform_factory(ax2.transData, ax2.transAxes)
-
     bbox = Bbox.from_extents(xmin, 0, xmax, 1)
 
-    mybbox1 = TransformedBbox(bbox, trans1)
-    mybbox2 = TransformedBbox(bbox, trans2)
+    mybbox1 = TransformedBbox(bbox, ax1.get_xaxis_transform())
+    mybbox2 = TransformedBbox(bbox, ax2.get_xaxis_transform())
 
     prop_patches = {**kwargs, "ec": "none", "alpha": 0.2}
 
diff --git a/lib/matplotlib/widgets.py b/lib/matplotlib/widgets.py
@@ -19,7 +19,6 @@
 from . import _api, cbook, colors, ticker
 from .lines import Line2D
 from .patches import Circle, Rectangle, Ellipse
-from .transforms import blended_transform_factory
 
 
 class LockDraw:
@@ -1716,12 +1715,10 @@ def new_axes(self, ax):
             self.connect_default_events()
 
         if self.direction == 'horizontal':
-            trans = blended_transform_factory(self.ax.transData,
-                                              self.ax.transAxes)
+            trans = ax.get_xaxis_transform()
             w, h = 0, 1
         else:
-            trans = blended_transform_factory(self.ax.transAxes,
-                                              self.ax.transData)
+            trans = ax.get_yaxis_transform()
             w, h = 1, 0
         self.rect = Rectangle((0, 0), w, h,
                               transform=trans,
