Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit c5386a3

Browse filesBrowse files
authored
Merge pull request #17235 from anntzer/aa
MNT/API: More axisartist cleanups
2 parents 002b27e + 35fdacb commit c5386a3
Copy full SHA for c5386a3

File tree

Expand file treeCollapse file tree

2 files changed

+34
-50
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

2 files changed

+34
-50
lines changed
Open diff view settings
Collapse file

‎lib/mpl_toolkits/axisartist/axis_artist.py‎

Copy file name to clipboardExpand all lines: lib/mpl_toolkits/axisartist/axis_artist.py
+34-47Lines changed: 34 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -362,10 +362,10 @@ class AxisLabel(AttributeCopier, LabelBase):
362362

363363
def __init__(self, *args, axis_direction="bottom", axis=None, **kwargs):
364364
self._axis = axis
365-
LabelBase.__init__(self, *args, **kwargs)
366-
self.set_axis_direction(axis_direction)
367365
self._pad = 5
368366
self._extra_pad = 0
367+
LabelBase.__init__(self, *args, **kwargs)
368+
self.set_axis_direction(axis_direction)
369369

370370
def set_pad(self, pad):
371371
"""
@@ -691,7 +691,7 @@ class AxisArtist(martist.Artist):
691691
is constant) line, ticks, ticklabels, and axis label.
692692
"""
693693

694-
ZORDER = 2.5
694+
zorder = ZORDER = 2.5 # ZORDER is a backcompat alias.
695695

696696
@property
697697
def LABELPAD(self):
@@ -728,26 +728,19 @@ def __init__(self, axes,
728728
+ self.axes.figure.dpi_scale_trans)
729729

730730
if axis_direction in ["left", "right"]:
731-
axis_name = "ytick"
732731
self.axis = axes.yaxis
733732
else:
734-
axis_name = "xtick"
735733
self.axis = axes.xaxis
736734

737735
self._axisline_style = None
738736
self._axis_direction = axis_direction
739737

740738
self._init_line()
741-
self._init_ticks(axis_name, **kwargs)
739+
self._init_ticks(**kwargs)
742740
self._init_offsetText(axis_direction)
743741
self._init_label()
744742

745-
self.set_zorder(self.ZORDER)
746-
747-
self._rotate_label_along_line = False
748-
749743
# axis direction
750-
self._tick_add_angle = 180.
751744
self._ticklabel_add_angle = 0.
752745
self._axislabel_add_angle = 0.
753746
self.set_axis_direction(axis_direction)
@@ -899,46 +892,40 @@ def _draw_line(self, renderer):
899892
self.line.set_line_mutation_scale(self.major_ticklabels.get_size())
900893
self.line.draw(renderer)
901894

902-
def _init_ticks(self, axis_name, **kwargs):
895+
def _init_ticks(self, **kwargs):
896+
axis_name = self.axis.axis_name
903897

904898
trans = (self._axis_artist_helper.get_tick_transform(self.axes)
905899
+ self.offset_transform)
906900

907-
major_tick_size = kwargs.get("major_tick_size",
908-
rcParams[f'{axis_name}.major.size'])
909-
major_tick_pad = kwargs.get("major_tick_pad",
910-
rcParams[f'{axis_name}.major.pad'])
911-
minor_tick_size = kwargs.get("minor_tick_size",
912-
rcParams[f'{axis_name}.minor.size'])
913-
minor_tick_pad = kwargs.get("minor_tick_pad",
914-
rcParams[f'{axis_name}.minor.pad'])
915-
916-
self.major_ticks = Ticks(major_tick_size,
917-
axis=self.axis,
918-
transform=trans)
919-
self.minor_ticks = Ticks(minor_tick_size,
920-
axis=self.axis,
921-
transform=trans)
922-
923-
if axis_name == "xaxis":
924-
size = rcParams['xtick.labelsize']
925-
else:
926-
size = rcParams['ytick.labelsize']
927-
928-
self.major_ticklabels = TickLabels(size=size, axis=self.axis,
929-
axis_direction=self._axis_direction)
930-
self.minor_ticklabels = TickLabels(size=size, axis=self.axis,
931-
axis_direction=self._axis_direction)
932-
933-
self.major_ticklabels.set(figure=self.axes.figure,
934-
transform=trans,
935-
fontsize=size)
936-
self.major_ticklabels.set_pad(major_tick_pad)
937-
938-
self.minor_ticklabels.set(figure=self.axes.figure,
939-
transform=trans,
940-
fontsize=size)
941-
self.minor_ticklabels.set_pad(minor_tick_pad)
901+
self.major_ticks = Ticks(
902+
kwargs.get(
903+
"major_tick_size", rcParams[f"{axis_name}tick.major.size"]),
904+
axis=self.axis, transform=trans)
905+
self.minor_ticks = Ticks(
906+
kwargs.get(
907+
"minor_tick_size", rcParams[f"{axis_name}tick.minor.size"]),
908+
axis=self.axis, transform=trans)
909+
910+
size = rcParams[f"{axis_name}tick.labelsize"]
911+
self.major_ticklabels = TickLabels(
912+
axis=self.axis,
913+
axis_direction=self._axis_direction,
914+
figure=self.axes.figure,
915+
transform=trans,
916+
fontsize=size,
917+
pad=kwargs.get(
918+
"major_tick_pad", rcParams[f"{axis_name}tick.major.pad"]),
919+
)
920+
self.minor_ticklabels = TickLabels(
921+
axis=self.axis,
922+
axis_direction=self._axis_direction,
923+
figure=self.axes.figure,
924+
transform=trans,
925+
fontsize=size,
926+
pad=kwargs.get(
927+
"minor_tick_pad", rcParams[f"{axis_name}tick.minor.pad"]),
928+
)
942929

943930
def _get_tick_info(self, tick_iter):
944931
"""
Collapse file

‎lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py‎

Copy file name to clipboardExpand all lines: lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py
-3Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -361,9 +361,6 @@ def new_floating_axis(self, nth_coord,
361361
# axisline.major_ticklabels.set_visible(True)
362362
# axisline.minor_ticklabels.set_visible(False)
363363

364-
# axisline.major_ticklabels.set_rotate_along_line(True)
365-
# axisline.set_rotate_label_along_line(True)
366-
367364
return axisline
368365

369366
def _update_grid(self, x1, y1, x2, y2):

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.