Merge pull request #14747 from anntzer/dpi_scale_trans

QuLogic · web-flow · commit d176508622f4 · 2020-04-22T15:38:29.000-04:00
Deprecate AxisArtist.dpi_transform.
diff --git a/doc/api/api_changes_3.3/deprecations.rst b/doc/api/api_changes_3.3/deprecations.rst
@@ -469,3 +469,8 @@ keyword-only, consistently with ``Colorbar``.
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Passing ``None`` as either the ``radius`` or ``startangle`` of an `.Axes.pie`
 is deprecated; use the explicit defaults of 1 and 0, respectively, instead.
+
+``AxisArtist.dpi_transform``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+... is deprecated.  Scale ``Figure.dpi_scale_trans`` by 1/72 to achieve the
+same effect.
diff --git a/lib/mpl_toolkits/axisartist/axis_artist.py b/lib/mpl_toolkits/axisartist/axis_artist.py
@@ -743,9 +743,10 @@ def __init__(self, axes,
 
         if offset is None:
             offset = (0, 0)
-        self.dpi_transform = Affine2D()
-        self.offset_transform = ScaledTranslation(offset[0], offset[1],
-                                                  self.dpi_transform)
+        self.offset_transform = ScaledTranslation(
+            *offset,
+            Affine2D().scale(1 / 72)  # points to inches.
+            + self.axes.figure.dpi_scale_trans)
 
         if axis_direction in ["left", "right"]:
             axis_name = "ytick"
@@ -772,6 +773,11 @@ def __init__(self, axes,
         self._axislabel_add_angle = 0.
         self.set_axis_direction(axis_direction)
 
+    @cbook.deprecated("3.3")
+    @property
+    def dpi_transform(self):
+        return Affine2D().scale(1 / 72) + self.axes.figure.dpi_scale_trans
+
     # axis direction
 
     def set_axis_direction(self, axis_direction):
@@ -1181,12 +1187,7 @@ def set_label(self, s):
     def get_tightbbox(self, renderer):
         if not self.get_visible():
             return
-
         self._axis_artist_helper.update_lim(self.axes)
-
-        dpi_cor = renderer.points_to_pixels(1.)
-        self.dpi_transform.clear().scale(dpi_cor)
-
         self._update_ticks(renderer)
         self._update_label(renderer)
         bb = [
@@ -1205,21 +1206,13 @@ def get_tightbbox(self, renderer):
     @martist.allow_rasterization
     def draw(self, renderer):
         # docstring inherited
-
         if not self.get_visible():
             return
-
         renderer.open_group(__name__, gid=self.get_gid())
-
         self._axis_artist_helper.update_lim(self.axes)
-
-        dpi_cor = renderer.points_to_pixels(1.)
-        self.dpi_transform.clear().scale(dpi_cor)
-
         self._draw_ticks(renderer)
         self._draw_line(renderer)
         self._draw_label(renderer)
-
         renderer.close_group(__name__)
 
     def toggle(self, all=None, ticks=None, ticklabels=None, label=None):
