Skip to content

Commit 24d92e1

Browse files
jklymakjklymak
committed
MNT: change name to _get_renderer
1 parent 333243a commit 24d92e1

File tree

13 files changed

+35
-39
lines changed

13 files changed

+35
-39
lines changed

‎lib/matplotlib/_tight_layout.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,10 +198,6 @@ def auto_adjust_subplotpars(
198198
ax_bbox_list, pad, h_pad, w_pad, rect)
199199

200200

201-
def get_renderer(fig):
202-
fig._get_cached_renderer()
203-
204-
205201
def get_subplotspec_list(axes_list, grid_spec=None):
206202
"""
207203
Return a list of subplotspec from the given list of axes.

‎lib/matplotlib/axes/_base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4478,7 +4478,7 @@ def get_tightbbox(self, renderer=None, call_axes_locator=True,
44784478

44794479
bb = []
44804480
if renderer is None:
4481-
renderer = self.figure._get_cached_renderer()
4481+
renderer = self.figure._get_renderer()
44824482

44834483
if not self.get_visible():
44844484
return None

‎lib/matplotlib/axis.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1206,7 +1206,7 @@ def _update_ticks(self):
12061206
def _get_ticklabel_bboxes(self, ticks, renderer=None):
12071207
"""Return lists of bboxes for ticks' label1's and label2's."""
12081208
if renderer is None:
1209-
renderer = self.figure._get_cached_renderer()
1209+
renderer = self.figure._get_renderer()
12101210
return ([tick.label1.get_window_extent(renderer)
12111211
for tick in ticks if tick.label1.get_visible()],
12121212
[tick.label2.get_window_extent(renderer)
@@ -1225,7 +1225,7 @@ def get_tightbbox(self, renderer=None, *, for_layout_only=False):
12251225
if not self.get_visible():
12261226
return
12271227
if renderer is None:
1228-
renderer = self.figure._get_cached_renderer()
1228+
renderer = self.figure._get_renderer()
12291229
ticks_to_draw = self._update_ticks()
12301230

12311231
self._update_label_position(renderer)

‎lib/matplotlib/figure.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1646,7 +1646,7 @@ def get_tightbbox(self, renderer=None, bbox_extra_artists=None):
16461646
"""
16471647

16481648
if renderer is None:
1649-
renderer = self.figure._get_cached_renderer()
1649+
renderer = self.figure._get_renderer()
16501650

16511651
bb = []
16521652
if bbox_extra_artists is None:
@@ -2063,8 +2063,8 @@ def dpi(self):
20632063
def dpi(self, value):
20642064
self._parent.dpi = value
20652065

2066-
def _get_cached_renderer(self):
2067-
return self._parent._get_cached_renderer()
2066+
def _get_renderer(self):
2067+
return self._parent._get_renderer()
20682068

20692069
def _redo_transform_rel_fig(self, bbox=None):
20702070
"""
@@ -2494,7 +2494,7 @@ def axes(self):
24942494

24952495
get_axes = axes.fget
24962496

2497-
def _get_cached_renderer(self):
2497+
def _get_renderer(self):
24982498
if self._cachedRenderer is not None:
24992499
return self._cachedRenderer
25002500
elif hasattr(self.canvas, 'get_renderer'):
@@ -2650,7 +2650,7 @@ def get_constrained_layout_pads(self, relative=False):
26502650
hspace = info['hspace']
26512651

26522652
if relative and (w_pad is not None or h_pad is not None):
2653-
renderer = self._get_cached_renderer()
2653+
renderer = self._get_renderer()
26542654
dpi = renderer.dpi
26552655
w_pad = w_pad * dpi / renderer.width
26562656
h_pad = h_pad * dpi / renderer.height

‎lib/matplotlib/gridspec.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ def tight_layout(self, figure, renderer=None,
474474
"might be incorrect.")
475475

476476
if renderer is None:
477-
renderer = _tight_layout.get_renderer(figure)
477+
renderer = figure._get_renderer()
478478

479479
kwargs = _tight_layout.get_tight_layout_figure(
480480
figure, figure.axes, subplotspec_list, renderer,

‎lib/matplotlib/image.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1425,7 +1425,7 @@ def __init__(self, bbox,
14251425

14261426
def get_window_extent(self, renderer=None):
14271427
if renderer is None:
1428-
renderer = self.get_figure()._get_cached_renderer()
1428+
renderer = self.get_figure()._get_renderer()
14291429

14301430
if isinstance(self.bbox, BboxBase):
14311431
return self.bbox

‎lib/matplotlib/layout_engine.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ def execute(self, fig):
152152
_api.warn_external("This figure includes Axes that are not "
153153
"compatible with tight_layout, so results "
154154
"might be incorrect.")
155-
renderer = fig._get_cached_renderer()
155+
renderer = fig._get_renderer()
156156
with getattr(renderer, "_draw_disabled", nullcontext)():
157157
kwargs = get_tight_layout_figure(
158158
fig, fig.axes, subplotspec_list, renderer,

‎lib/matplotlib/legend.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -882,7 +882,7 @@ def get_title(self):
882882
def get_window_extent(self, renderer=None):
883883
# docstring inherited
884884
if renderer is None:
885-
renderer = self.figure._get_cached_renderer()
885+
renderer = self.figure._get_renderer()
886886
return self._legend_box.get_window_extent(renderer=renderer)
887887

888888
def get_tightbbox(self, renderer=None):

‎lib/matplotlib/offsetbox.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ def get_extent(self, renderer):
348348
def get_window_extent(self, renderer=None):
349349
# docstring inherited
350350
if renderer is None:
351-
renderer = self.figure._get_cached_renderer()
351+
renderer = self.figure._get_renderer()
352352
w, h, xd, yd, offsets = self.get_extent_offsets(renderer)
353353
px, py = self.get_offset(w, h, xd, yd, renderer)
354354
return mtransforms.Bbox.from_bounds(px - xd, py - yd, w, h)
@@ -636,7 +636,7 @@ def get_offset(self):
636636
def get_window_extent(self, renderer=None):
637637
# docstring inherited
638638
if renderer is None:
639-
renderer = self.figure._get_cached_renderer()
639+
renderer = self.figure._get_renderer()
640640
w, h, xd, yd = self.get_extent(renderer)
641641
ox, oy = self.get_offset() # w, h, xd, yd)
642642

@@ -798,7 +798,7 @@ def get_offset(self):
798798
def get_window_extent(self, renderer=None):
799799
# docstring inherited
800800
if renderer is None:
801-
renderer = self.figure._get_cached_renderer()
801+
renderer = self.figure._get_renderer()
802802
w, h, xd, yd = self.get_extent(renderer)
803803
ox, oy = self.get_offset()
804804
return mtransforms.Bbox.from_bounds(ox - xd, oy - yd, w, h)
@@ -901,7 +901,7 @@ def get_offset(self):
901901
def get_window_extent(self, renderer=None):
902902
# docstring inherited
903903
if renderer is None:
904-
renderer = self.figure._get_cached_renderer()
904+
renderer = self.figure._get_renderer()
905905
w, h, xd, yd = self.get_extent(renderer)
906906
ox, oy = self.get_offset() # w, h, xd, yd)
907907
return mtransforms.Bbox.from_bounds(ox - xd, oy - yd, w, h)
@@ -1085,7 +1085,7 @@ def set_bbox_to_anchor(self, bbox, transform=None):
10851085
def get_window_extent(self, renderer=None):
10861086
# docstring inherited
10871087
if renderer is None:
1088-
renderer = self.figure._get_cached_renderer()
1088+
renderer = self.figure._get_renderer()
10891089

10901090
self._update_offset_func(renderer)
10911091
w, h, xd, yd = self.get_extent(renderer)
@@ -1251,7 +1251,7 @@ def get_children(self):
12511251
def get_window_extent(self, renderer=None):
12521252
# docstring inherited
12531253
if renderer is None:
1254-
renderer = self.figure._get_cached_renderer()
1254+
renderer = self.figure._get_renderer()
12551255
w, h, xd, yd = self.get_extent(renderer)
12561256
ox, oy = self.get_offset()
12571257
return mtransforms.Bbox.from_bounds(ox - xd, oy - yd, w, h)
@@ -1432,7 +1432,7 @@ def get_fontsize(self):
14321432
def get_window_extent(self, renderer=None):
14331433
# docstring inherited
14341434
if renderer is None:
1435-
renderer = self.figure._get_cached_renderer()
1435+
renderer = self.figure._get_renderer()
14361436
return Bbox.union([child.get_window_extent(renderer)
14371437
for child in self.get_children()])
14381438

@@ -1553,7 +1553,7 @@ def on_motion(self, evt):
15531553
if self._use_blit:
15541554
self.canvas.restore_region(self.background)
15551555
self.ref_artist.draw(
1556-
self.ref_artist.figure._get_cached_renderer())
1556+
self.ref_artist.figure._get_renderer())
15571557
self.canvas.blit()
15581558
else:
15591559
self.canvas.draw()
@@ -1569,7 +1569,7 @@ def on_pick(self, evt):
15691569
self.background = \
15701570
self.canvas.copy_from_bbox(self.ref_artist.figure.bbox)
15711571
self.ref_artist.draw(
1572-
self.ref_artist.figure._get_cached_renderer())
1572+
self.ref_artist.figure._get_renderer())
15731573
self.canvas.blit()
15741574
self._c1 = self.canvas.callbacks._connect_picklable(
15751575
"motion_notify_event", self.on_motion)
@@ -1619,7 +1619,7 @@ def __init__(self, ref_artist, offsetbox, use_blit=False):
16191619

16201620
def save_offset(self):
16211621
offsetbox = self.offsetbox
1622-
renderer = offsetbox.figure._get_cached_renderer()
1622+
renderer = offsetbox.figure._get_renderer()
16231623
w, h, xd, yd = offsetbox.get_extent(renderer)
16241624
offset = offsetbox.get_offset(w, h, xd, yd, renderer)
16251625
self.offsetbox_x, self.offsetbox_y = offset
@@ -1631,7 +1631,7 @@ def update_offset(self, dx, dy):
16311631

16321632
def get_loc_in_canvas(self):
16331633
offsetbox = self.offsetbox
1634-
renderer = offsetbox.figure._get_cached_renderer()
1634+
renderer = offsetbox.figure._get_renderer()
16351635
w, h, xd, yd = offsetbox.get_extent(renderer)
16361636
ox, oy = offsetbox._offset
16371637
loc_in_canvas = (ox - xd, oy - yd)

‎lib/matplotlib/table.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ def draw(self, renderer):
398398
# Need a renderer to do hit tests on mouseevent; assume the last one
399399
# will do
400400
if renderer is None:
401-
renderer = self.figure._get_cached_renderer()
401+
renderer = self.figure._get_renderer()
402402
if renderer is None:
403403
raise RuntimeError('No renderer defined')
404404

@@ -432,7 +432,7 @@ def contains(self, mouseevent):
432432
return inside, info
433433
# TODO: Return index of the cell containing the cursor so that the user
434434
# doesn't have to bind to each one individually.
435-
renderer = self.figure._get_cached_renderer()
435+
renderer = self.figure._get_renderer()
436436
if renderer is not None:
437437
boxes = [cell.get_window_extent(renderer)
438438
for (row, col), cell in self._cells.items()
@@ -449,7 +449,7 @@ def get_children(self):
449449
def get_window_extent(self, renderer=None):
450450
# docstring inherited
451451
if renderer is None:
452-
renderer = self.figure._get_cached_renderer()
452+
renderer = self.figure._get_renderer()
453453
self._update_positions(renderer)
454454
boxes = [cell.get_window_extent(renderer)
455455
for cell in self._cells.values()]

‎lib/matplotlib/text.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -905,7 +905,7 @@ def get_window_extent(self, renderer=None, dpi=None):
905905
if renderer is not None:
906906
self._renderer = renderer
907907
if self._renderer is None:
908-
self._renderer = self.figure._get_cached_renderer()
908+
self._renderer = self.figure._get_renderer()
909909
if self._renderer is None:
910910
raise RuntimeError(
911911
"Cannot get window extent of text w/o renderer. You likely "
@@ -1570,7 +1570,7 @@ def _get_position_xy(self, renderer):
15701570
def _check_xy(self, renderer=None):
15711571
"""Check whether the annotation at *xy_pixel* should be drawn."""
15721572
if renderer is None:
1573-
renderer = self.figure._get_cached_renderer()
1573+
renderer = self.figure._get_renderer()
15741574
b = self.get_annotation_clip()
15751575
if b or (b is None and self.xycoords == "data"):
15761576
# check if self.xy is inside the axes.
@@ -2007,7 +2007,7 @@ def get_window_extent(self, renderer=None):
20072007
if renderer is not None:
20082008
self._renderer = renderer
20092009
if self._renderer is None:
2010-
self._renderer = self.figure._get_cached_renderer()
2010+
self._renderer = self.figure._get_renderer()
20112011
if self._renderer is None:
20122012
raise RuntimeError('Cannot get window extent w/o renderer')
20132013

‎lib/matplotlib/widgets.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,7 +1224,7 @@ def _rendercursor(self):
12241224
# This causes a single extra draw if the figure has never been rendered
12251225
# yet, which should be fine as we're going to repeatedly re-render the
12261226
# figure later anyways.
1227-
if self.ax.figure._get_cached_renderer() is None:
1227+
if self.ax.figure._get_renderer() is None:
12281228
self.ax.figure.canvas.draw()
12291229

12301230
text = self.text_disp.get_text() # Save value before overwriting it.
@@ -1946,7 +1946,7 @@ def ignore(self, event):
19461946
def update(self):
19471947
"""Draw using blit() or draw_idle(), depending on ``self.useblit``."""
19481948
if (not self.ax.get_visible() or
1949-
self.ax.figure._get_cached_renderer() is None):
1949+
self.ax.figure._get_renderer() is None):
19501950
return False
19511951
if self.useblit:
19521952
if self.background is not None:

‎lib/mpl_toolkits/axisartist/axis_artist.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ def draw(self, renderer):
252252

253253
def get_window_extent(self, renderer=None):
254254
if renderer is None:
255-
renderer = self.figure._get_cached_renderer()
255+
renderer = self.figure._get_renderer()
256256

257257
# save original and adjust some properties
258258
tr = self.get_transform()
@@ -366,7 +366,7 @@ def draw(self, renderer):
366366

367367
def get_window_extent(self, renderer=None):
368368
if renderer is None:
369-
renderer = self.figure._get_cached_renderer()
369+
renderer = self.figure._get_renderer()
370370
if not self.get_visible():
371371
return
372372

@@ -520,7 +520,7 @@ def set_locs_angles_labels(self, locs_angles_labels):
520520

521521
def get_window_extents(self, renderer=None):
522522
if renderer is None:
523-
renderer = self.figure._get_cached_renderer()
523+
renderer = self.figure._get_renderer()
524524

525525
if not self.get_visible():
526526
self._axislabel_pad = self._external_pad
@@ -858,7 +858,7 @@ def _update_ticks(self, renderer=None):
858858
# majorticks even for minor ticks. not clear what is best.
859859

860860
if renderer is None:
861-
renderer = self.figure._get_cached_renderer()
861+
renderer = self.figure._get_renderer()
862862

863863
dpi_cor = renderer.points_to_pixels(1.)
864864
if self.major_ticks.get_visible() and self.major_ticks.get_tick_out():

0 commit comments

Comments
 (0)