FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Include outward ticks in bounding box by mdboom · Pull Request #5683 · matplotlib/matplotlib · GitHub

  1. matplotlib
  2. matplotlib

Repository navigation

Include outward ticks in bounding box #5683

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
tacaswell merged 5 commits into from
Dec 19, 2015
Conversation 19 Commits 5 Checks 0 Files changed
Merged

Include outward ticks in bounding box #5683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
46ae4d9
Include outward ticks in bounding box
mdboom Dec 15, 2015
62804e8
Correct comment
mdboom Dec 15, 2015
97b3985
Address comments in PR
mdboom Dec 17, 2015
0bf73c1
Add test
mdboom Dec 16, 2015
0a4b52e
Handle case where there are no ticks
mdboom Dec 17, 2015
File filter

Filter by extension

Filter by extension .pdf  (1) .png  (1) .py  (3) .svg  (1) All 4 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
6 changes: 5 additions & 1 deletion lib/matplotlib/axes/_base.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,11 @@ def get_window_extent(self, *args, **kwargs):
get the axes bounding box in display space; *args* and
*kwargs* are empty
"""
return self.bbox
bbox = self.bbox
x_pad = self.xaxis.get_tick_padding()
y_pad = self.yaxis.get_tick_padding()
return mtransforms.Bbox([[bbox.x0 - x_pad, bbox.y0 - y_pad],
[bbox.x1 + x_pad, bbox.y1 + y_pad]])

WeatherGod Dec 16, 2015

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Is this going to work for polar axes? I would also double-check that this doesn't utterly bork for axes3d (not that I'd expect it to work great there, just to not crash or something).

mdboom Dec 16, 2015

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

polar axes don't have ticks -- but it does appear that this needs to be updated so it's aware of when the ticks are present or not.

It doesn't seem to crash for axes3d, though as you say, it doesn't really do the right thin other than add a bit more space.

def _init_axis(self):
"move this out of __init__ because non-separable axes don't use it"
Expand Down
32 changes: 26 additions & 6 deletions lib/matplotlib/axis.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,20 @@ def apply_tickdir(self, tickdir):
"""
pass

def get_tickdir(self):
return self._tickdir

def get_tick_padding(self):
"""
Get the length of the tick outside of the axes.
"""
padding = {
'in': 0.0,
'inout': 0.5,
'out': 1.0
}
return self._size * padding[self._tickdir]

def get_children(self):
children = [self.tick1line, self.tick2line,
self.gridline, self.label1, self.label2]
Expand Down Expand Up @@ -349,13 +363,11 @@ def apply_tickdir(self, tickdir):

if self._tickdir == 'in':
self._tickmarkers = (mlines.TICKUP, mlines.TICKDOWN)
self._pad = self._base_pad
elif self._tickdir == 'inout':
self._tickmarkers = ('|', '|')
self._pad = self._base_pad + self._size / 2.
else:
self._tickmarkers = (mlines.TICKDOWN, mlines.TICKUP)
self._pad = self._base_pad + self._size
self._pad = self._base_pad + self.get_tick_padding()
self.stale = True

def _get_text1(self):
Expand Down Expand Up @@ -485,13 +497,11 @@ def apply_tickdir(self, tickdir):

if self._tickdir == 'in':
self._tickmarkers = (mlines.TICKRIGHT, mlines.TICKLEFT)
self._pad = self._base_pad
elif self._tickdir == 'inout':
self._tickmarkers = ('_', '_')
self._pad = self._base_pad + self._size / 2.
else:
self._tickmarkers = (mlines.TICKLEFT, mlines.TICKRIGHT)
self._pad = self._base_pad + self._size
self._pad = self._base_pad + self.get_tick_padding()
self.stale = True

# how far from the y axis line the right of the ticklabel are
Expand Down Expand Up @@ -1097,6 +1107,16 @@ def get_tightbbox(self, renderer):
else:
return None

def get_tick_padding(self):
values = []
if len(self.majorTicks):
values.append(self.majorTicks[0].get_tick_padding())
if len(self.minorTicks):
values.append(self.minorTicks[0].get_tick_padding())
if len(values):
return max(values)
return 0.0

@allow_rasterization
def draw(self, renderer, *args, **kwargs):
'Draw the axis lines, grid lines, tick lines and labels'
Expand Down
Binary file added lib/matplotlib/tests/baseline_images/test_tightlayout/outward_ticks.pdf
Show comments
View file
Open in desktop
Binary file not shown.
Binary file added lib/matplotlib/tests/baseline_images/test_tightlayout/outward_ticks.png
Show comments
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Viewer requires iframe.
Loading
Back | FazBrowse Home | New Git URL