Skip to content

Polar tick improvements #9068

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 15 commits into from
Sep 26, 2017
Merged

Polar tick improvements #9068

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
73e4425
Use custom *Axis in polar plots.
QuLogic Aug 4, 2017
30b4a6c
Add a custom ThetaTick for polar plots.
QuLogic Aug 4, 2017
8c430e8
Add a custom RadialTick for polar plots.
QuLogic Aug 4, 2017
386bb30
Apply padding to radial ticks in polar plots.
QuLogic Aug 10, 2017
ba242b1
Apply padding to theta ticks in polar plots.
QuLogic Aug 10, 2017
a2531ee
Add clip path when resetting radial ticks.
QuLogic Aug 29, 2017
5f1ecbd
Add info about polar tick(label) changes.
QuLogic Aug 29, 2017
9529875
Restore old polar tick label behaviour for full circles.
QuLogic Aug 30, 2017
5b8d2df
Tweak padding on angular ticks to match previous.
QuLogic Aug 30, 2017
33377ce
Enable ticks on some polar plot tests.
QuLogic Aug 31, 2017
80a5f10
Cleanup polar tick changes based on review.
QuLogic Aug 31, 2017
77e2532
Ensure polar ticks are always "right-side up".
QuLogic Sep 25, 2017
228ee53
Add an 'auto' option to label rotation.
QuLogic Sep 25, 2017
549c07f
Re-create polar tests images with new ticks.
QuLogic Sep 25, 2017
15c57bd
Fix small grammatical errors.
QuLogic Sep 26, 2017
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
Apply padding to radial ticks in polar plots.
  • Loading branch information
@QuLogic
QuLogic committed Sep 25, 2017
commit 386bb303171ac6bfb9c49ffc23c307eb10f595c6
72 changes: 66 additions & 6 deletions lib/matplotlib/projections/polar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,58 @@ def view_limits(self, vmin, vmax):
return mtransforms.nonsingular(min(0, vmin), vmax)


class _ThetaShift(mtransforms.ScaledTranslation):
"""
Apply a padding shift based on axes theta limits.

This is used to create padding for radial ticks.

Parameters
----------
axes : matplotlib.axes.Axes
The owning axes; used to determine limits.
pad : float
The padding to apply, in points.
start : str, {'min', 'max', 'rlabel'}
Whether to shift away from the start (``'min'``) or the end (``'max'``)
of the axes, or using the rlabel position (``'rlabel'``).
"""
def __init__(self, axes, pad, mode):
mtransforms.ScaledTranslation.__init__(self, pad, pad,
axes.figure.dpi_scale_trans)
self.set_children(axes._realViewLim)
self.axes = axes
self.mode = mode
self.pad = pad

def get_matrix(self):
if self._invalid:
if self.mode == 'rlabel':
angle = (
np.deg2rad(self.axes.get_rlabel_position()) *
self.axes.get_theta_direction() +
self.axes.get_theta_offset()
)
else:
if self.mode == 'min':
angle = self.axes._realViewLim.xmin
elif self.mode == 'max':
angle = self.axes._realViewLim.xmax
angle %= 2 * np.pi
Copy link
Contributor

Choose a reason for hiding this comment

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

It only looks like angle is used below in trig functions--why is all of the playing with cycles of 2 * pi necessary? They should just work, regardless, right?

Copy link
Member Author

Choose a reason for hiding this comment

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

I recall something weird happening before; it might have been when things were mixed degrees/radians and I hadn't realized which units were in use at this location. I will double-check to see if this is necessary.

if angle < 0:
angle += 2 * np.pi

if self.mode in ('rlabel', 'min'):
padx = np.cos(angle - np.pi / 2)
pady = np.sin(angle - np.pi / 2)
else:
padx = np.cos(angle + np.pi / 2)
pady = np.sin(angle + np.pi / 2)

self._t = (self.pad * padx / 72, self.pad * pady / 72)
return mtransforms.ScaledTranslation.get_matrix(self)


class RadialTick(maxis.YTick):
"""
A radial-axis tick.
Expand Down Expand Up @@ -746,17 +798,25 @@ def get_yaxis_transform(self, which='grid'):

def get_yaxis_text1_transform(self, pad):
thetamin, thetamax = self._realViewLim.intervalx
full = _is_full_circle_rad(thetamin, thetamax)
if self.get_theta_direction() > 0 or full:
return self._yaxis_text_transform, 'center', 'left'
if _is_full_circle_rad(thetamin, thetamax):
halign = 'left'
pad_shift = _ThetaShift(self, pad, 'rlabel')
elif self.get_theta_direction() > 0:
halign = 'left'
pad_shift = _ThetaShift(self, pad, 'min')
else:
return self._yaxis_text_transform, 'center', 'right'
halign = 'right'
pad_shift = _ThetaShift(self, pad, 'max')
return self._yaxis_text_transform + pad_shift, 'center', halign

def get_yaxis_text2_transform(self, pad):
if self.get_theta_direction() > 0:
return self._yaxis_text_transform, 'center', 'right'
halign = 'right'
pad_shift = _ThetaShift(self, pad, 'max')
else:
return self._yaxis_text_transform, 'center', 'left'
halign = 'left'
pad_shift = _ThetaShift(self, pad, 'min')
return self._yaxis_text_transform + pad_shift, 'center', halign

def draw(self, *args, **kwargs):
thetamin, thetamax = self._realViewLim.intervalx
Expand Down