10000 Polar tick fixes by QuLogic · Pull Request #9881 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

Polar tick fixes #9881

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 6 commits into from
Dec 1, 2017
Merged

Polar tick fixes #9881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c8dd523
Always use centre alignment for polar theta ticks.
QuLogic Nov 27, 2017
332b986
Fix radial tick anchors on clockwise polar plots.
QuLogic Nov 27, 2017
eca6b49
Fix tick auto-orientation on clockwise polar plots.
QuLogic Nov 28, 2017
ed2e97f
Add test of ticks on clockwise polar wedges.
QuLogic Nov 28, 2017
3b93255
Remove extra polar tick resets.
QuLogic Nov 29, 2017
4341f00
Add better text anchors for default polar radial ticks.
QuLogic Nov 29, 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
106 changes: 69 additions & 37 deletions lib/matplotlib/projections/polar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,8 +300,9 @@ def _update_padding(self, pad, angle):
def update_position(self, loc):
super(ThetaTick, self).update_position(loc)
axes = self.axes
angle = (loc * axes.get_theta_direction() +
axes.get_theta_offset() - np.pi / 2)
angle = loc * axes.get_theta_direction() + axes.get_theta_offset()
text_angle = np.rad2deg(angle) % 360 - 90
angle -= np.pi / 2

if self.tick1On:
marker = self.tick1line.get_marker()
Expand All @@ -326,17 +327,17 @@ def update_position(self, loc):

mode, user_angle = self._labelrotation
if mode == 'default':
angle = 0
text_angle = user_angle
else:
if angle > np.pi / 2:
angle -= np.pi
elif angle < -np.pi / 2:
angle += np.pi
angle = np.rad2deg(angle) + user_angle
if text_angle > 90:
text_angle -= 180
elif text_angle < -90:
text_angle += 180
text_angle += user_angle
if self.label1On:
self.label1.set_rotation(angle)
self.label1.set_rotation(text_angle)
if self.label2On:
self.label2.set_rotation(angle)
self.label2.set_rotation(text_angle)

# This extra padding helps preserve the look from previous releases but
# is also needed because labels are anchored to their center.
Expand Down Expand Up @@ -504,17 +505,59 @@ def _get_text2(self):
t.set_rotation_mode('anchor')
return t

def _determine_anchor(self, angle, start):
if start:
if -90 <= angle <= 90:
return 'left', 'center'
def _determine_anchor(self, mode, angle, start):
# Note: angle is the (spine angle - 90) because it's used for the tick
# & text setup, so all numbers below are -90 from (normed) spine angle.
if mode == 'auto':
if start:
if -90 <= angle <= 90:
return 'left', 'center'
else:
return 'right', 'center'
else:
return 'right', 'center'
if -90 <= angle <= 90:
return 'right', 'center'
else:
return 'left', 'center'
else:
if -90 <= angle <= 90:
return 'right', 'center'
if start:
if angle < -68.5:
return 'center', 'top'
elif angle < -23.5:
return 'left', 'top'
elif angle < 22.5:
return 'left', 'center'
elif angle < 67.5:
return 'left', 'bottom'
elif angle < 112.5:
return 'center', 'bottom'
elif angle < 157.5:
return 'right', 'bottom'
elif angle < 202.5:
return 'right', 'center'
elif angle < 247.5:
return 'right', 'top'
else:
return 'center', 'top'
else:
return 'left', 'center'
if angle < -68.5:
return 'center', 'bottom'
elif angle < -23.5:
return 'right', 'bottom'
elif angle < 22.5:
return 'right', 'center'
elif angle < 67.5:
return 'right', 'top'
elif angle < 112.5:
return 'center', 'top'
elif angle < 157.5:
return 'left', 'top'
elif angle < 202.5:
return 'left', 'center'
elif angle < 247.5:
return 'left', 'bottom'
else:
return 'center', 'bottom'

def update_position(self, loc):
super(RadialTick, self).update_position(loc)
Expand All @@ -527,7 +570,8 @@ def update_position(self, loc):
full = _is_full_circle_deg(thetamin, thetamax)

if full:
angle = axes.get_rlabel_position() * direction + offset - 90
angle = (axes.get_rlabel_position() * direction +
offset) % 360 - 90
tick_angle = 0
if angle > 90:
text_angle = angle - 180
Expand All @@ -536,7 +580,7 @@ def update_position(self, loc):
else:
text_angle = angle
else:
angle = thetamin * direction + offset - 90
angle = (thetamin * direction + offset) % 360 - 90
if direction > 0:
tick_angle = np.deg2rad(angle)
else:
Expand All @@ -557,7 +601,7 @@ def update_position(self, loc):
ha = 'left'
va = 'bottom'
else:
ha, va = self._determine_anchor(angle, True)
ha, va = self._determine_anchor(mode, angle, direction > 0)
self.label1.set_ha(ha)
self.label1.set_va(va)
self.label1.set_rotation(text_angle)
Expand All @@ -584,7 +628,7 @@ def update_position(self, loc):
self.label2On = False
self.tick2On = False
else:
angle = thetamax * direction + offset - 90
angle = (thetamax * direction + offset) % 360 - 90
if direction > 0:
tick_angle = np.deg2rad(angle)
else:
Expand All @@ -601,7 +645,7 @@ def update_position(self, loc):
else:
text_angle = user_angle
if self.label2On:
ha, va = self._determine_anchor(angle, False)
ha, va = self._determine_anchor(mode, angle, direction < 0)
self.label2.set_ha(ha)
self.label2.set_va(va)
self.label2.set_rotation(text_angle)
Expand Down Expand Up @@ -888,16 +932,10 @@ def get_xaxis_transform(self, which='grid'):
return self._xaxis_transform

def get_xaxis_text1_transform(self, pad):
if _is_full_circle_rad(*self._realViewLim.intervalx):
return self._xaxis_text_transform, 'center', 'center'
else:
return self._xaxis_text_transform, 'bottom', 'center'
return self._xaxis_text_transform, 'center', 'center'

def get_xaxis_text2_transform(self, pad):
if _is_full_circle_rad(*self._realViewLim.intervalx):
return self._xaxis_text_transform, 'center', 'center'
else:
return self._xaxis_text_transform, 'top', 'center'
return self._xaxis_text_transform, 'center', 'center'

def get_yaxis_transform(self, which='grid'):
if which in ('tick1', 'tick2'):
Expand Down Expand Up @@ -1072,10 +1110,6 @@ def set_theta_direction(self, direction):
raise ValueError(
"direction must be 1, -1, clockwise or counterclockwise")
self._direction.invalidate()
# FIXME: Why is this needed? Even though the tick label gets
# re-created, the alignment is not correctly updated without a reset.
self.yaxis.reset_ticks()
self.yaxis.set_clip_path(self.patch)

def get_theta_direction(self):
"""
Expand Down Expand Up @@ -1132,8 +1166,6 @@ def set_rlabel_position(self, value):
The angular position of the radius labels in degrees.
"""
self._r_label_position.clear().translate(np.deg2rad(value), 0.0)
self.yaxis.reset_ticks()
self.yaxis.set_clip_path(self.patch)

def set_yscale(self, *args, **kwargs):
Axes.set_yscale(self, *args, **kwargs)
Expand Down
Binary file modified lib/matplotlib/tests/baseline_images/test_axes/polar_theta_wedge.pdf
View file
Open in desktop
Binary file not shown.
Binary file modified lib/matplotlib/tests/baseline_images/test_axes/polar_theta_wedge.png
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.
Loading
0