8000 Add an Annulus patch class by astromancer · Pull Request #9888 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

Add an Annulus patch class #9888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Apr 15, 2021
Merged

Add an Annulus patch class #9888

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
e4697e7
add Annulus patch
astromancer Nov 22, 2017
a05fb1e
'add Annulus patch for making elliptical annuli'
astromancer Nov 30, 2017
ecd6083
docstring fixes
astromancer Jan 7, 2018
bd3f498
better str repr
astromancer Jan 8, 2018
e1f863e
add what's new entry
astromancer Jan 8, 2018
ad81c4b
add image test
astromancer Jan 8, 2018
7bc465a
tweaks
astromancer Jan 9, 2018
83047be
update docstring
astromancer Mar 3, 2021
32a5daf
add whats new
astromancer Mar 3, 2021
9f12372
cleanup test
astromancer Mar 3, 2021
05cd23a
flake8
astromancer Mar 3, 2021
a5cf0c5
simplify hstack
astromancer Mar 10, 2021
d2fc81a
Apply suggestions from code review
astromancer Mar 12, 2021
23bd2da
attr setters/getters
astromancer Mar 14, 2021
f0392f6
flake8
astromancer Mar 14, 2021
0882ed8
update setters
astromancer Mar 27, 2021
0ba1cba
test setters and string repr
astromancer Mar 27, 2021
b21d4ee
update docs
astromancer Apr 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
better str repr
  • Loading branch information
@astromancer
astromancer committed Mar 3, 2021
commit bd3f498d03d63a0244fe8f5133201c661b5e22f5
14 changes: 6 additions & 8 deletions lib/matplotlib/patches.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1560,14 +1560,12 @@ class Annulus(Patch):

def __str__(self):
if self.a == self.b:
fmt = "Annulus(xy=(%s, %s), r=%s, width=%s, angle=%s)"
pars = (self.center[0], self.center[1],
self.a, self.width, self.angle)
r = str(self.a)
else:
fmt = "Annulus(xy=(%s, %s), r=(%s, %s), width=%s, angle=%s)"
pars = (self.center[0], self.center[1],
self.a, self.b, self.width, self.angle)
return fmt % pars
r = '(%s, %s)' % (self.a, self.b)

return "Annulus(xy=(%s, %s), r=%s, width=%s, angle=%s)" % \
(self.center[0], self.center[1], r, self.width, self.angle)

@docstring.dedent_interpd
def __init__(self, xy, r, width, angle=0.0, **kwargs):
Expand Down Expand Up @@ -1598,7 +1596,7 @@ def __init__(self, xy, r, width, angle=0.0, **kwargs):
self.a = self.b = float(r)
else:
raise ValueError(
'r parameter should be either float, or sequence of size 2')
'r parameter should be either float, or array_like of size 2')

if min(self.a, self.b) <= width:
raise ValueError(
Expand Down
0