Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 766db51

Browse filesBrowse files
authored
Merge pull request #20051 from anntzer/ob33
Remove offsetbox APIs deprecated in Matplotlib 3.3.
2 parents bc5d5b8 + 638bdbc commit 766db51
Copy full SHA for 766db51

File tree

Expand file treeCollapse file tree

2 files changed

+15
-29
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+15
-29
lines changed
+8Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Removal of deprecated ``offsetbox`` APIs
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
The following APIs were removed:
4+
5+
- the *s* kwarg to `.AnnotationBbox.get_fontsize` (which had no effect),
6+
- the ``DraggableBase.artist_picker`` method (set the artist's picker instead),
7+
- the ``DraggableBase.on_motion_blit`` method (use `.DraggableBase.on_motion`
8+
instead).

‎lib/matplotlib/offsetbox.py

Copy file name to clipboardExpand all lines: lib/matplotlib/offsetbox.py
+7-29Lines changed: 7 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1478,8 +1478,7 @@ def set_fontsize(self, s=None):
14781478
self.prop = FontProperties(size=s)
14791479
self.stale = True
14801480

1481-
@_api.delete_parameter("3.3", "s")
1482-
def get_fontsize(self, s=None):
1481+
def get_fontsize(self):
14831482
"""Return the fontsize in points."""
14841483
return self.prop.get_size_in_points()
14851484

@@ -1618,22 +1617,15 @@ def finalize_offset(self):
16181617

16191618
def __init__(self, ref_artist, use_blit=False):
16201619
self.ref_artist = ref_artist
1620+
if not ref_artist.pickable():
1621+
ref_artist.set_picker(True)
16211622
self.got_artist = False
1622-
16231623
self.canvas = self.ref_artist.figure.canvas
16241624
self._use_blit = use_blit and self.canvas.supports_blit
1625-
1626-
c2 = self.canvas.mpl_connect('pick_event', self.on_pick)
1627-
c3 = self.canvas.mpl_connect('button_release_event', self.on_release)
1628-
1629-
if not ref_artist.pickable():
1630-
ref_artist.set_picker(True)
1631-
overridden_picker = _api.deprecate_method_override(
1632-
__class__.artist_picker, self, since="3.3",
1633-
addendum="Directly set the artist's picker if desired.")
1634-
if overridden_picker is not None:
1635-
ref_artist.set_picker(overridden_picker)
1636-
self.cids = [c2, c3]
1625+
self.cids = [
1626+
self.canvas.mpl_connect('pick_event', self.on_pick),
1627+
self.canvas.mpl_connect('button_release_event', self.on_release),
1628+
]
16371629

16381630
def on_motion(self, evt):
16391631
if self._check_still_parented() and self.got_artist:
@@ -1647,16 +1639,6 @@ def on_motion(self, evt):
16471639
else:
16481640
self.canvas.draw()
16491641

1650-
@_api.deprecated("3.3", alternative="self.on_motion")
1651-
def on_motion_blit(self, evt):
1652-
if self._check_still_parented() and self.got_artist:
1653-
dx = evt.x - self.mouse_x
1654-
dy = evt.y - self.mouse_y
1655-
self.update_offset(dx, dy)
1656-
self.canvas.restore_region(self.background)
1657-
self.ref_artist.draw(self.ref_artist.figure._cachedRenderer)
1658-
self.canvas.blit()
1659-
16601642
def on_pick(self, evt):
16611643
if self._check_still_parented() and evt.artist == self.ref_artist:
16621644
self.mouse_x = evt.mouseevent.x
@@ -1700,10 +1682,6 @@ def disconnect(self):
17001682
else:
17011683
self.canvas.mpl_disconnect(c1)
17021684

1703-
@_api.deprecated("3.3", alternative="self.ref_artist.contains")
1704-
def artist_picker(self, artist, evt):
1705-
return self.ref_artist.contains(evt)
1706-
17071685
def save_offset(self):
17081686
pass
17091687

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.