Skip to content

Sticky margins #7476

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 20 commits into from
Dec 4, 2016
Merged

Sticky margins #7476

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
b73a939
Minor cleanups.
anntzer Nov 17, 2016
a2e35cc
Sticky margins cancellation system.
anntzer Nov 17, 2016
0fa187e
Sticky margins support for contour.
anntzer Nov 17, 2016
e646152
Update test images.
anntzer Nov 17, 2016
5d82bcb
DOC: remove docs for removed API
tacaswell Nov 20, 2016
16cba9d
FIX: use valid local variable
tacaswell Nov 20, 2016
eb1ce75
DOC: remove margin from docs
tacaswell Nov 21, 2016
1285264
Set hist minimum value to 0
efiring Nov 24, 2016
253eac3
fix sticky-handling of 0 with log scale
efiring Nov 24, 2016
fbf97d4
Rely on normal autoscaling for stepfilled hist.
efiring Nov 24, 2016
5f942c8
hist: correct minimum stickies for log case; remove unneeded code
efiring Nov 24, 2016
36fcfe5
change stickies to sticky_edges; clarify edge calculation in contour
efiring Nov 25, 2016
70a37f1
fix sticky-handling in raw ContourSet; remove tight specifications
efiring Nov 25, 2016
1a50dda
restore autoscale(tight=True); still needed for classic mode.
efiring Nov 25, 2016
717c278
minor code rearrangement for clarity; augmented sticky_edges docstring
efiring Nov 26, 2016
840986e
test_triangulation: increase tolerance on Windows
efiring Nov 28, 2016
1a86b08
DOC sticky edges now uses numpydoc
NelleV Dec 1, 2016
04298b8
add ax.use_sticky_edges property
efiring Dec 2, 2016
93c1bd8
MNT: remove extraneous autoscale call
tacaswell Dec 3, 2016
360dba7
Remove extraneous stale setting; fix indent.
anntzer Dec 3, 2016
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
Remove extraneous stale setting; fix indent.
  • Loading branch information
@anntzer
anntzer committed Dec 3, 2016
commit 360dba71f6f3518ed6ed1e360a312bcd6fa06cec
8 changes: 4 additions & 4 deletions lib/matplotlib/axes/_axes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5804,10 +5804,10 @@ def pcolorfast(self, *args, **kwargs):

if style == "image":
im = mimage.AxesImage(self, cmap, norm,
interpolation='nearest',
origin='lower',
extent=(xl, xr, yb, yt),
**kwargs)
interpolation='nearest',
origin='lower',
extent=(xl, xr, yb, yt),
**kwargs)
im.set_data(C)
im.set_alpha(alpha)
elif style == "pcolorimage":
Expand Down
2 changes: 1 addition & 1 deletion lib/matplotlib/axes/_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2055,7 +2055,7 @@ def use_sticky_edges(self):
@use_sticky_edges.setter
def use_sticky_edges(self, b):
self._use_sticky_edges = bool(b)
Copy link
Member

Choose a reason for hiding this comment

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

Should this also re-trigger an auto-scaling?

Copy link
Member

Choose a reason for hiding this comment

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

I was wondering about that also, but decided against it. I could be convinced otherwise for now, but long term I think we might want to consolidate the autoscaling at draw time instead of having calls to autoscale_view sprinkled all over the place. I don't think it makes sense to trigger autoscaling with every change in the state of the plot.

Copy link
Member

Choose a reason for hiding this comment

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

I am convinced

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Do we actually need the axes as stale? This won't have an effect until the next autoscaling, which should also mark it as stale, right?

Copy link
Member

Choose a reason for hiding this comment

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

Good point. You are welcome to replace it with a comment to that effect. I think I put the call in because we tend to have it in every function that potentially changes how the plot will look.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done, together with indentation fix below.

Copy link
Member

Choose a reason for hiding this comment

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

Not sure I agree with this, if as Eric suggests above we move towards autoscaling a draw time (as late as possible) then marking the figure as stale will trigger a re-draw (and hence the re-autoscaling).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good point.
On the other hand this is easy enough to revert when we do switch to draw-time autoscaling (which makes complete sense).

self.stale = True
# No effect until next autoscaling, which will mark the axes as stale.

def set_xmargin(self, m):
"""
Expand Down