Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Non string projection definitions #694

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

Closed
wants to merge 16 commits into from
Closed

Non string projection definitions #694

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1a0021b
Class projection support added.
Jan 31, 2012
ab0615c
Tweaked.
Jan 31, 2012
756dd8c
Added documentation, supported add_axes regarding _as_mpl_axes.
Feb 6, 2012
40a0ec9
reverted projections change.
Feb 6, 2012
53cbea6
Tidied up branch a little.
Feb 6, 2012
bd0fd6e
Matching up diffs with github's diff viewer (newlines).
Feb 6, 2012
eb37499
Fixed error messages substitution.
Feb 6, 2012
1fa7d39
Corrected having not hit git add before committing.
Feb 6, 2012
89053c5
Reverted polar check.
Feb 6, 2012
7674dcd
Further tweaks re add_axes.
Feb 6, 2012
f8021a2
Review actions
Feb 20, 2012
677a0ed
Minor doc changes
Feb 20, 2012
836a459
Fixed error raising unittest case
Feb 20, 2012
564e042
Review actions #2
Feb 27, 2012
270f291
Review actions #3
Feb 29, 2012
597b6f0
Changed version which these changes take effect.
Mar 16, 2012
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
Fixed error messages substitution.
  • Loading branch information
Phil Elson committed Feb 6, 2012
commit eb37499b3f005da393778a3b6deaf8ca32a892f6
21 changes: 10 additions & 11 deletions lib/matplotlib/figure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,9 +697,8 @@ def add_axes(self, *args, **kwargs):
if ispolar:
if projection is not None and projection != 'polar':
raise ValueError(
"polar=True, yet projection='%s'. " +
"Only one of these arguments should be supplied." %
projection)
"polar=True, yet projection='%s'. " % projection +
"Only one of these arguments should be supplied.")
projection = 'polar'

if isinstance(projection, basestring) or projection is None:
Expand All @@ -708,7 +707,8 @@ def add_axes(self, *args, **kwargs):
projection_class, extra_kwargs = projection._as_mpl_axes()
kwargs.update(**extra_kwargs)
else:
TypeError('projection must be a string, None or implement a _as_mpl_axes method. Got %r' % projection)
TypeError('projection must be a string, None or implement a '
'_as_mpl_axes method. Got %r' % projection)

a = projection_factory(projection, self, rect, **kwargs)

Expand Down Expand Up @@ -762,9 +762,8 @@ def add_subplot(self, *args, **kwargs):
if ispolar:
if projection is not None:
raise ValueError(
"polar=True, yet projection=%r. " +
"Only one of these arguments should be supplied." %
projection)
"polar=True, yet projection=%r. " % projection +
"Only one of these arguments should be supplied.")
projection = 'polar'

if isinstance(projection, basestring) or projection is None:
Expand All @@ -773,7 +772,8 @@ def add_subplot(self, *args, **kwargs):
projection_class, extra_kwargs = projection._as_mpl_axes()
kwargs.update(**extra_kwargs)
else:
TypeError('projection must be a string, None or implement a _as_mpl_axes method. Got %r' % projection)
TypeError('projection must be a string, None or implement a '
'_as_mpl_axes method. Got %r' % projection)

# Remake the key without projection kwargs:
key = self._make_key(*args, **kwargs)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Problem right here... in add_axes(), the key is made in the beginning without the extra_kwargs, but here, the key could be made with the extra kwargs, possibly preventing the ability to find an existing axes. This key making needs to be moved up to an earlier spot in the function.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but, then again, we see that there are already changes made to kwargs... must find a judicious spot for the keymaker.

Expand Down Expand Up @@ -1058,9 +1058,8 @@ def gca(self, **kwargs):
if ispolar:
if projection is not None and projection != 'polar':
raise ValueError(
"polar=True, yet projection='%s'. " +
"Only one of these arguments should be supplied." %
projection)
"polar=True, yet projection='%s'. " % projection +
"Only one of these arguments should be supplied.")
projection = 'polar'

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No "_as_mpl_axes" code here? Believe it or not, but many users use "fig.gca()" as shorthand for "fig.add_axes()" or "fig.add_subplot(111)".

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good spot Ben. I have factored out the commonality between add_axes/add_subplot/gca which will make my changes a little noisy. I will be adding the commit shortly.

projection_class = get_projection_class(projection)
Expand Down