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 729467c

Browse filesBrowse files
committed
Simplify EllipseCollection setter and tidy up typing
1 parent 45a6a6f commit 729467c
Copy full SHA for 729467c

File tree

Expand file treeCollapse file tree

2 files changed

+12
-21
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+12
-21
lines changed

‎lib/matplotlib/collections.py

Copy file name to clipboardExpand all lines: lib/matplotlib/collections.py
+10-19Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1745,9 +1745,9 @@ def __init__(self, widths, heights, angles, *, units='points', **kwargs):
17451745
Forwarded to `Collection`.
17461746
"""
17471747
super().__init__(**kwargs)
1748-
self._set_widths(widths)
1749-
self._set_heights(heights)
1750-
self._set_angles(angles)
1748+
self.set_widths(widths)
1749+
self.set_heights(heights)
1750+
self.set_angles(angles)
17511751
self._units = units
17521752
self.set_transform(transforms.IdentityTransform())
17531753
self._transforms = np.empty((0, 3, 3))
@@ -1795,23 +1795,19 @@ def _set_transforms(self):
17951795
m[:2, 2:] = 0
17961796
self.set_transform(_affine(m))
17971797

1798-
def _set_widths(self, widths):
1799-
self._widths = 0.5 * np.asarray(widths).ravel()
1800-
1801-
def _set_heights(self, heights):
1802-
self._heights = 0.5 * np.asarray(heights).ravel()
1803-
1804-
def _set_angles(self, angles):
1805-
self._angles = np.deg2rad(angles).ravel()
1806-
18071798
def set_widths(self, widths):
18081799
"""Set the lengths of the first axes (e.g., major axis)."""
1809-
self._set_widths(widths)
1800+
self._widths = 0.5 * np.asarray(widths).ravel()
18101801
self.stale = True
18111802

18121803
def set_heights(self, heights):
18131804
"""Set the lengths of second axes (e.g., minor axes)."""
1814-
self._set_heights(heights)
1805+
self._heights = 0.5 * np.asarray(heights).ravel()
1806+
self.stale = True
1807+
1808+
def set_angles(self, angles):
1809+
"""Set the angles of the first axes, degrees CCW from the x-axis."""
1810+
self._angles = np.deg2rad(angles).ravel()
18151811
self.stale = True
18161812

18171813
def get_widths(self):
@@ -1822,11 +1818,6 @@ def get_heights(self):
18221818
"""Set the lengths of second axes (e.g., minor axes)."""
18231819
return self._heights * 2
18241820

1825-
def set_angles(self, angles):
1826-
"""Set the angles of the first axes, degrees CCW from the x-axis."""
1827-
self._set_angles(angles)
1828-
self.stale = True
1829-
18301821
def get_angles(self):
18311822
"""Get the angles of the first axes, degrees CCW from the x-axis."""
18321823
return np.rad2deg(self._angles)

‎lib/matplotlib/collections.pyi

Copy file name to clipboardExpand all lines: lib/matplotlib/collections.pyi
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,10 +181,10 @@ class EllipseCollection(Collection):
181181
**kwargs
182182
) -> None: ...
183183
def set_widths(self, widths: ArrayLike) -> None: ...
184-
def get_widths(self) -> ArrayLike: ...
185184
def set_heights(self, heights: ArrayLike) -> None: ...
186-
def get_heights(self) -> ArrayLike: ...
187185
def set_angles(self, angles: ArrayLike) -> None: ...
186+
def get_widths(self) -> ArrayLike: ...
187+
def get_heights(self) -> ArrayLike: ...
188188
def get_angles(self) -> ArrayLike: ...
189189

190190
class PatchCollection(Collection):

0 commit comments

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