Merge pull request #12346 from ImportanceOfBeingErnest/auto-backport-of-pr-12261-on-v2.2.x

QuLogic · web-flow · commit d37825658906 · 2018-09-30T03:11:01.000-04:00
Backport PR #12261: FIX: parasite axis2 demo
diff --git a/lib/mpl_toolkits/axisartist/axis_artist.py b/lib/mpl_toolkits/axisartist/axis_artist.py
@@ -327,9 +327,8 @@ def draw(self, renderer):
 
         for loc, angle in self.locs_angles:
             marker_rotation.clear().rotate_deg(angle+add_angle)
-            locs = path_trans.transform_non_affine([loc])
-            if (self.axes and
-                    not self.axes.viewLim.contains(locs[0][0], locs[0][1])):
+            locs = path_trans.transform_non_affine(np.array([loc]))
+            if self.axes and not self.axes.viewLim.contains(*locs[0]):
                 continue
             renderer.draw_markers(gc, self._tickvert_path, marker_transform,
                                   Path(locs), path_trans.get_affine())
diff --git a/lib/mpl_toolkits/tests/test_axisartist_axislines.py b/lib/mpl_toolkits/tests/test_axisartist_axislines.py
@@ -7,6 +7,8 @@
 
 from mpl_toolkits.axisartist.axislines import SubplotZero, Subplot
 
+from mpl_toolkits.axisartist import Axes
+
 
 @image_comparison(baseline_images=['SubplotZero'],
                   extensions=['png'], style='default')
@@ -43,3 +45,14 @@ def test_Subplot():
     ax.axis["bottom"].major_ticks.set_tick_out(True)
 
     ax.axis["bottom"].set_label("Tk0")
+
+
+def test_Axes():
+    fig = plt.figure()
+    ax = Axes(fig, [0.15, 0.1, 0.65, 0.8])
+    fig.add_axes(ax)
+    ax.plot([1, 2, 3], [0, 1, 2])
+
+    ax.set_xscale('log')
+
+    plt.show()
