Merge pull request #26184 from rcomer/annbbox-get_tightbbox · matplotlib/matplotlib@b71260a · GitHub

matplotlib / matplotlib Public

• Notifications You must be signed in to change notification settings
• Fork 8.5k
• Star 23.3k

• Code
• Issues 1.1k
• Pull requests 433
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Additional navigation options

Commit b71260a

Browse filesBrowse the repository at this point in the historyBrowse files

QuLogic

authored

Merge pull request #26184 from rcomer/annbbox-get_tightbbox

FIX: AnnotationBbox extents before draw

2 parents 9ced0c0 + 79250d1 commit b71260a
Copy full SHA for b71260a

2 files changed

+12-16Lines changed: 12 additions & 16 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• lib/matplotlib
  • offsetbox.py
  • tests
    • test_offsetbox.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎lib/matplotlib/offsetbox.py‎

Copy file name to clipboardExpand all lines: lib/matplotlib/offsetbox.py

+4Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -1389,11 +1389,15 @@ def get_window_extent(self, renderer=None):
1389	1389	# docstring inherited
1390	1390	if renderer is None:
1391	1391	renderer = self.figure._get_renderer()
	1392	+ self.update_positions(renderer)
1392	1393	return Bbox.union([child.get_window_extent(renderer)
1393	1394	for child in self.get_children()])
1394	1395
1395	1396	def get_tightbbox(self, renderer=None):
1396	1397	# docstring inherited
	1398	+ if renderer is None:
	1399	+ renderer = self.figure._get_renderer()
	1400	+ self.update_positions(renderer)
1397	1401	return Bbox.union([child.get_tightbbox(renderer)
1398	1402	for child in self.get_children()])
1399	1403

Collapse file

‎lib/matplotlib/tests/test_offsetbox.py‎

Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_offsetbox.py

+8-16Lines changed: 8 additions & 16 deletions

Original file line number	Diff line number	Diff line change
@@ -257,7 +257,8 @@ def test_anchoredtext_horizontal_alignment():
257	257	ax.add_artist(text2)
258	258
259	259
260		- def test_annotationbbox_extents():
	260	+ @pytest.mark.parametrize("extent_kind", ["window_extent", "tightbbox"])
	261	+ def test_annotationbbox_extents(extent_kind):
261	262	plt.rcParams.update(plt.rcParamsDefault)
262	263	fig, ax = plt.subplots(figsize=(4, 3), dpi=100)
263	264
@@ -284,31 +285,22 @@ def test_annotationbbox_extents():
284	285	arrowprops=dict(arrowstyle="->"))
285	286	ax.add_artist(ab6)
286	287
287		- fig.canvas.draw()
288		- renderer = fig.canvas.get_renderer()
289		-
290	288	# Test Annotation
291		- bb1w = an1.get_window_extent(renderer)
292		- bb1e = an1.get_tightbbox(renderer)
	289	+ bb1 = getattr(an1, f"get_{extent_kind}")()
293	290
294	291	target1 = [332.9, 242.8, 467.0, 298.9]
295		- assert_allclose(bb1w.extents, target1, atol=2)
296		- assert_allclose(bb1e.extents, target1, atol=2)
	292	+ assert_allclose(bb1.extents, target1, atol=2)
297	293
298	294	# Test AnnotationBbox
299		- bb3w = ab3.get_window_extent(renderer)
300		- bb3e = ab3.get_tightbbox(renderer)
	295	+ bb3 = getattr(ab3, f"get_{extent_kind}")()
301	296
302	297	target3 = [-17.6, 129.0, 200.7, 167.9]
303		- assert_allclose(bb3w.extents, target3, atol=2)
304		- assert_allclose(bb3e.extents, target3, atol=2)
	298	+ assert_allclose(bb3.extents, target3, atol=2)
305	299
306		- bb6w = ab6.get_window_extent(renderer)
307		- bb6e = ab6.get_tightbbox(renderer)
	300	+ bb6 = getattr(ab6, f"get_{extent_kind}")()
308	301
309	302	target6 = [180.0, -32.0, 230.0, 92.9]
310		- assert_allclose(bb6w.extents, target6, atol=2)
311		- assert_allclose(bb6e.extents, target6, atol=2)
	303	+ assert_allclose(bb6.extents, target6, atol=2)
312	304
313	305	# Test bbox_inches='tight'
314	306	buf = io.BytesIO()

0 commit comments

Comments

0 (0)