From 8a3ce1daad257955af5bb3b286c6f95d91490021 Mon Sep 17 00:00:00 2001
From: Jody Klymak <jklymak@gmail.com>
Date: Thu, 29 Jul 2021 21:41:12 -0700
Subject: [PATCH] FIX: pass dpi from parent to subfigure correctly if dpi
 changes

---
 lib/matplotlib/axis.py                        |  12 +++--
 lib/matplotlib/figure.py                      |   9 +++-
 .../test_subfigure_scatter_size.png           | Bin 0 -> 4605 bytes
 lib/matplotlib/tests/test_figure.py           |  45 ++++++++++++++++++
 4 files changed, 61 insertions(+), 5 deletions(-)
 create mode 100644 lib/matplotlib/tests/baseline_images/test_figure/test_subfigure_scatter_size.png

diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
index aa63514c61ff..887cf97ef140 100644
--- a/lib/matplotlib/axis.py
+++ b/lib/matplotlib/axis.py
@@ -2252,8 +2252,10 @@ def set_default_intervals(self):
         self.stale = True
 
     def get_tick_space(self):
-        ends = self.axes.transAxes.transform([[0, 0], [1, 0]])
-        length = ((ends[1][0] - ends[0][0]) / self.axes.figure.dpi) * 72
+        ends = mtransforms.Bbox.from_bounds(0, 0, 1, 1)
+        ends = ends.transformed(self.axes.transAxes -
+                                self.figure.dpi_scale_trans)
+        length = ends.width * 72
         # There is a heuristic here that the aspect ratio of tick text
         # is no more than 3:1
         size = self._get_tick_label_size('x') * 3
@@ -2512,8 +2514,10 @@ def set_default_intervals(self):
         self.stale = True
 
     def get_tick_space(self):
-        ends = self.axes.transAxes.transform([[0, 0], [0, 1]])
-        length = ((ends[1][1] - ends[0][1]) / self.axes.figure.dpi) * 72
+        ends = mtransforms.Bbox.from_bounds(0, 0, 1, 1)
+        ends = ends.transformed(self.axes.transAxes -
+                                self.figure.dpi_scale_trans)
+        length = ends.height * 72
         # Having a spacing of at least 2 just looks good.
         size = self._get_tick_label_size('y') * 2
         if size > 0:
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
index 404179341264..3a5f11957ed8 100644
--- a/lib/matplotlib/figure.py
+++ b/lib/matplotlib/figure.py
@@ -1980,7 +1980,6 @@ def __init__(self, parent, subplotspec, *,
         self.subplotpars = parent.subplotpars
         self.dpi_scale_trans = parent.dpi_scale_trans
         self._axobservers = parent._axobservers
-        self.dpi = parent.dpi
         self.canvas = parent.canvas
         self.transFigure = parent.transFigure
         self.bbox_relative = None
@@ -2001,6 +2000,14 @@ def __init__(self, parent, subplotspec, *,
         if parent._layoutgrid is not None:
             self.init_layoutgrid()
 
+    @property
+    def dpi(self):
+        return self._parent.dpi
+
+    @dpi.setter
+    def dpi(self, value):
+        self._parent.dpi = value
+
     def _redo_transform_rel_fig(self, bbox=None):
         """
         Make the transSubfigure bbox relative to Figure transform.
diff --git a/lib/matplotlib/tests/baseline_images/test_figure/test_subfigure_scatter_size.png b/lib/matplotlib/tests/baseline_images/test_figure/test_subfigure_scatter_size.png
new file mode 100644
index 0000000000000000000000000000000000000000..c193b5d0ec223873ef51b84c0d2901e8e22a90a6
GIT binary patch
literal 4605
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
bc{ew>G===lzX<xT1#I8q?Oy&l{@XtQ8!LP6

literal 0
HcmV?d00001

diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
index ccb1381fa5b5..c8458a21118c 100644
--- a/lib/matplotlib/tests/test_figure.py
+++ b/lib/matplotlib/tests/test_figure.py
@@ -1031,6 +1031,51 @@ def test_subfigure_spanning():
     np.testing.assert_allclose(sub_figs[2].bbox.max, [w, h / 3])
 
 
+@mpl.style.context('mpl20')
+def test_subfigure_ticks():
+    # This tests a tick-spacing error that only seems applicable
+    # when the subfigures are saved to file.  It is very hard to replicate
+    fig = plt.figure(constrained_layout=True, figsize=(10, 3))
+    # create left/right subfigs nested in bottom subfig
+    (subfig_bl, subfig_br) = fig.subfigures(1, 2, wspace=0.01,
+                                            width_ratios=[7, 2])
+
+    # put ax1-ax3 in gridspec of bottom-left subfig
+    gs = subfig_bl.add_gridspec(nrows=1, ncols=14)
+
+    ax1 = subfig_bl.add_subplot(gs[0, :1])
+    ax1.scatter(x=[-56.46881504821776, 24.179891162109396], y=[1500, 3600])
+
+    ax2 = subfig_bl.add_subplot(gs[0, 1:3], sharey=ax1)
+    ax2.scatter(x=[-126.5357270050049, 94.68456736755368], y=[1500, 3600])
+    ax3 = subfig_bl.add_subplot(gs[0, 3:14], sharey=ax1)
+
+    fig.set_dpi(120)
+    fig.draw_no_output()
+    ticks120 = ax2.get_xticks()
+    fig.set_dpi(300)
+    fig.draw_no_output()
+    ticks300 = ax2.get_xticks()
+    np.testing.assert_allclose(ticks120, ticks300)
+
+
+@image_comparison(['test_subfigure_scatter_size.png'], style='mpl20',
+                   remove_text=True)
+def test_subfigure_scatter_size():
+    # markers in the left- and right-most subplots should be the same
+    fig = plt.figure()
+    gs = fig.add_gridspec(1, 2)
+    ax0 = fig.add_subplot(gs[1])
+    ax0.scatter([1, 2, 3], [1, 2, 3], s=30, marker='s')
+    ax0.scatter([3, 4, 5], [1, 2, 3], s=[20, 30, 40], marker='s')
+
+    sfig = fig.add_subfigure(gs[0])
+    axs = sfig.subplots(1, 2)
+    for ax in [ax0, axs[0]]:
+        ax.scatter([1, 2, 3], [1, 2, 3], s=30, marker='s', color='r')
+        ax.scatter([3, 4, 5], [1, 2, 3], s=[20, 30, 40], marker='s', color='g')
+
+
 def test_add_subplot_kwargs():
     # fig.add_subplot() always creates new axes, even if axes kwargs differ.
     fig = plt.figure()