8000 fix some mistakes · matplotlib/matplotlib@bc93a9e · GitHub
[go: up one dir, main page]
Skip to content

Commit bc93a9e

Browse files
jklymakjklymak
committed
fix some mistakes
1 parent 9d87614 commit bc93a9e

File tree

5 files changed

+19
-14
lines changed

5 files changed

+19
-14
lines changed

‎lib/matplotlib/_tight_layout.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ def auto_adjust_subplotpars(
201201
def get_renderer(fig):
202202
fig._get_cached_renderer()
203203

204+
204205
def get_subplotspec_list(axes_list, grid_spec=None):
205206
"""
206207
Return a list of subplotspec from the given list of axes.

‎lib/matplotlib/figure.py

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1567,14 +1567,6 @@ def get_default_bbox_extra_artists(self):
15671567
bbox_artists.extend(ax.get_default_bbox_extra_artists())
15681568
return bbox_artists
15691569

1570-
def _get_cached_renderer(self):
1571-
if self._cachedRenderer is not None:
1572-
return self._cachedRenderer
1573-
elif hasattr(self.canvas, 'get_renderer'):
1574-
return self.canvas.get_renderer()
1575-
else:
1576-
return _get_renderer(self)
1577-
15781570
def get_tightbbox(self, renderer=None, bbox_extra_artists=None):
15791571
"""
15801572
Return a (tight) bounding box of the figure *in inches*.
@@ -2014,6 +2006,9 @@ def dpi(self):
20142006
def dpi(self, value):
20152007
self._parent.dpi = value
20162008

2009+
def _get_cached_renderer(self):
2010+
return self._parent._get_cached_renderer()
2011+
20172012
def _redo_transform_rel_fig(self, bbox=None):
20182013
"""
20192014
Make the transSubfigure bbox relative to Figure transform.
@@ -2441,6 +2436,14 @@ def axes(self):
24412436

24422437
get_axes = axes.fget
24432438

2439+
def _get_cached_renderer(self):
2440+
if self._cachedRenderer is not None:
2441+
return self._cachedRenderer
2442+
elif hasattr(self.canvas, 'get_renderer'):
2443+
return self.canvas.get_renderer()
2444+
else:
2445+
return _get_renderer(self)
2446+
24442447
def _get_dpi(self):
24452448
return self._dpi
24462449

@@ -2885,7 +2888,7 @@ def draw_without_rendering(self):
28852888
Draw the figure with no output. Useful to get the final size of
28862889
artists that require a draw before their size is known (e.g. text).
28872890
"""
2888-
renderer = self._get_cached_renderer()
2891+
renderer = _get_renderer(self)
28892892
with renderer._draw_disabled():
28902893
self.draw(renderer)
28912894

‎lib/matplotlib/layout_engine.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
from matplotlib._constrained_layout import do_constrained_layout
2323
from matplotlib._tight_layout import (get_subplotspec_list,
2424
get_tight_layout_figure)
25-
# from matplotlib.backend_bases import _get_renderer
26-
from matplotlib._tight_layout import get_renderer
2725

2826

2927
class LayoutEngine:

‎lib/matplotlib/offsetbox.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1552,7 +1552,8 @@ def on_motion(self, evt):
15521552
self.update_offset(dx, dy)
15531553
if self._use_blit:
15541554
self.canvas.restore_region(self.background)
1555-
self.ref_artist.draw(self.ref_artist.figure._get_cached_renderer())
1555+
self.ref_artist.draw(
1556+
self.ref_artist.figure._get_cached_renderer())
15561557
self.canvas.blit()
15571558
else:
15581559
self.canvas.draw()
@@ -1567,7 +1568,8 @@ def on_pick(self, evt):
15671568
self.canvas.draw()
15681569
self.background = \
15691570
self.canvas.copy_from_bbox(self.ref_artist.figure.bbox)
1570-
self.ref_artist.draw(self.ref_artist.figure._get_cached_renderer())
1571+
self.ref_artist.draw(
1572+
self.ref_artist.figure._get_cached_renderer())
15711573
self.canvas.blit()
15721574
self._c1 = self.canvas.callbacks._connect_picklable(
15731575
"motion_notify_event", self.on_motion)

‎lib/matplotlib/widgets.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1930,7 +1930,8 @@ def ignore(self, event):
19301930

19311931
def update(self):
19321932
"""Draw using blit() or draw_idle(), depending on ``self.useblit``."""
1933-
if not self.ax.get_visible() or self.ax.figure._get_cached_renderer() is None:
1933+
if (not self.ax.get_visible() or
1934+
self.ax.figure._get_cached_renderer() is None):
19341935
return False
19351936
if self.useblit:
19361937
if self.background is not None:

0 commit comments

Comments
 (0)
0