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
Minor doc changes
  • Loading branch information
Phil Elson committed Feb 20, 2012
commit 677a0edbb54c0ed1e48fdaa6ebbc404169b49b6a
14 changes: 7 additions & 7 deletions lib/matplotlib/figure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ def add(self, key, a):
return Stack.push(self, (key, (self._ind, a)))

def current_key_axes(self):
"""Return a tuple of (key, axes) for the last axes added."""
"""Return a tuple of (key, axes) for the active axes."""
if not len(self._elements):
return self._default, self._default
else:
Expand Down Expand Up @@ -1052,15 +1052,15 @@ def gca(self, **kwargs):
were used in its creation.

"""
ckey, kax = self._axstack.current_key_axes()
ckey, cax = self._axstack.current_key_axes()
# if there exists an axes on the stack see if it maches
# the desired axes configuration
if kax is not None:
if cax is not None:

# if no kwargs are given just return the current axes
# this is a convenience for gca() on axes such as polar etc.
if not kwargs:
return kax
return cax

# if the user has specified particular projection detail
# then build up a key which can represent this
Expand All @@ -1070,10 +1070,10 @@ def gca(self, **kwargs):
kwargs_copy = kwargs.copy()
projection_class, _, key = \
process_projection_requirements(self, **kwargs_copy)
# if the kax matches this key then return the axes, otherwise
# if the cax matches this key then return the axes, otherwise
# continue and a new axes will be created
if key == ckey and isinstance(kax, projection_class):
return kax
if key == ckey and isinstance(cax, projection_class):
return cax

return self.add_subplot(111, **kwargs)

Expand Down