From 0c96f777589b3f809f1633a735e295e85af8a239 Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Fri, 22 Mar 2019 16:43:49 +0100 Subject: [PATCH] Remove duplicated methods in FixedAxisArtistHelper. These are copy-pasted from the same methods in the parent class FloatingAxisArtistHelper. Also cleanup a bit the base method implementation. --- lib/mpl_toolkits/axisartist/floating_axes.py | 34 ------------------- .../axisartist/grid_helper_curvelinear.py | 23 +++++++------ 2 files changed, 12 insertions(+), 45 deletions(-) diff --git a/lib/mpl_toolkits/axisartist/floating_axes.py b/lib/mpl_toolkits/axisartist/floating_axes.py index 5dc3dbb6e339..efa6b4fe894b 100644 --- a/lib/mpl_toolkits/axisartist/floating_axes.py +++ b/lib/mpl_toolkits/axisartist/floating_axes.py @@ -40,37 +40,6 @@ def update_lim(self, axes): self.grid_helper.update_lim(axes) self.grid_info = self.grid_helper.grid_info - def get_axislabel_pos_angle(self, axes): - - extremes = self.grid_info["extremes"] - - if self.nth_coord == 0: - xx0 = self.value - yy0 = (extremes[2]+extremes[3])/2. - dxx, dyy = 0., abs(extremes[2]-extremes[3])/1000. - elif self.nth_coord == 1: - xx0 = (extremes[0]+extremes[1])/2. - yy0 = self.value - dxx, dyy = abs(extremes[0]-extremes[1])/1000., 0. - - grid_finder = self.grid_helper.grid_finder - xx1, yy1 = grid_finder.transform_xy([xx0], [yy0]) - - trans_passingthrough_point = axes.transData + axes.transAxes.inverted() - p = trans_passingthrough_point.transform_point([xx1[0], yy1[0]]) - - if 0 <= p[0] <= 1 and 0 <= p[1] <= 1: - xx1c, yy1c = axes.transData.transform_point([xx1[0], yy1[0]]) - xx2, yy2 = grid_finder.transform_xy([xx0+dxx], [yy0+dyy]) - xx2c, yy2c = axes.transData.transform_point([xx2[0], yy2[0]]) - - return (xx1c, yy1c), np.arctan2(yy2c-yy1c, xx2c-xx1c)/np.pi*180. - else: - return None, None - - def get_tick_transform(self, axes): - return IdentityTransform() # axes.transData - def get_tick_iterators(self, axes): """tick_loc, tick_angle, tick_label, (optionally) tick_label""" @@ -164,9 +133,6 @@ def f1(): return f1(), iter([]) - def get_line_transform(self, axes): - return axes.transData - def get_line(self, axes): self.update_lim(axes) diff --git a/lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py b/lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py index 9427d92c712f..3647872ab718 100644 --- a/lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py +++ b/lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py @@ -157,25 +157,26 @@ def get_axislabel_pos_angle(self, axes): if self.nth_coord == 0: xx0 = self.value - yy0 = (extremes[2]+extremes[3])/2. - dxx, dyy = 0., abs(extremes[2]-extremes[3])/1000. + yy0 = (extremes[2] + extremes[3]) / 2 + dxx = 0 + dyy = abs(extremes[2] - extremes[3]) / 1000 elif self.nth_coord == 1: - xx0 = (extremes[0]+extremes[1])/2. + xx0 = (extremes[0] + extremes[1]) / 2 yy0 = self.value - dxx, dyy = abs(extremes[0]-extremes[1])/1000., 0. + dxx = abs(extremes[0] - extremes[1]) / 1000 + dyy = 0 grid_finder = self.grid_helper.grid_finder - xx1, yy1 = grid_finder.transform_xy([xx0], [yy0]) + (xx1,), (yy1,) = grid_finder.transform_xy([xx0], [yy0]) trans_passingthrough_point = axes.transData + axes.transAxes.inverted() - p = trans_passingthrough_point.transform_point([xx1[0], yy1[0]]) + p = trans_passingthrough_point.transform_point([xx1, yy1]) if 0 <= p[0] <= 1 and 0 <= p[1] <= 1: - xx1c, yy1c = axes.transData.transform_point([xx1[0], yy1[0]]) - xx2, yy2 = grid_finder.transform_xy([xx0+dxx], [yy0+dyy]) - xx2c, yy2c = axes.transData.transform_point([xx2[0], yy2[0]]) - - return (xx1c, yy1c), np.arctan2(yy2c-yy1c, xx2c-xx1c)/np.pi*180. + xx1c, yy1c = axes.transData.transform_point([xx1, yy1]) + (xx2,), (yy2,) = grid_finder.transform_xy([xx0 + dxx], [yy0 + dyy]) + xx2c, yy2c = axes.transData.transform_point([xx2, yy2]) + return (xx1c, yy1c), np.rad2deg(np.arctan2(yy2c-yy1c, xx2c-xx1c)) else: return None, None