changed to use set_xlim instead, also added tests

jrmlhermitte · Julien L · commit 76bdae4bfebd · 2017-04-14T13:52:28.000-04:00
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -997,7 +997,8 @@ def cla(self):
             self.xaxis.set_minor_locator(minl)
         else:
             self.xaxis._set_scale('linear')
-            self.viewLim.intervalx = (0, 1)
+            #self.viewLim.intervalx = (0, 1)
+            self.set_xlim(0,1)
 
         if self._sharey is not None:
             self.yaxis.major = self._sharey.yaxis.major
@@ -1021,7 +1022,8 @@ def cla(self):
             self.yaxis.set_minor_locator(minl)
         else:
             self.yaxis._set_scale('linear')
-            self.viewLim.intervaly = (0, 1)
+            #self.viewLim.intervaly = (0, 1)
+            self.set_ylim(0,1)
 
         # update the minor locator for x and y axis based on rcParams
         if (rcParams['xtick.minor.visible']):
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -177,6 +177,48 @@ def test_twin_inherit_autoscale_setting():
     assert ax_y_on.get_autoscaley_on()
     assert not ax_y_off.get_autoscaley_on()
 
+@cleanup
+def test_inverted_cla():
+    # Github PR #5450. Setting autoscale should reset 
+    # axes to be non-inverted.
+    # plotting an image, then 1d graph, axis is now down
+    fig = plt.figure(0);
+    ax = fig.gca()
+    # test that a new axis is not inverted per default
+    assert not(ax.xaxis_inverted())
+    assert not(ax.yaxis_inverted())
+    img = np.random.random((100,100))
+    ax.imshow(img)
+    # test that a image axis is inverted
+    assert not(ax.xaxis_inverted())
+    assert ax.yaxis_inverted()
+    ax.cla()
+    x = np.linspace(0,2*np.pi,100);
+    ax.plot(x,np.cos(x))
+    assert not(ax.xaxis_inverted())
+    assert not(ax.yaxis_inverted())
+
+    # autoscaling should not bring back axes to normal
+    ax.cla()
+    ax.imshow(img)
+    plt.autoscale()
+    assert not(ax.xaxis_inverted())
+    assert ax.yaxis_inverted()
+
+    # two shared axes. Clearing the master axis should bring axes in shared
+    # axies back to normal
+    ax0 = plt.subplot(211)
+    ax1 = plt.subplot(212, sharey=ax0)
+    ax0.imshow(img)
+    ax1.plot(x,np.cos(x))
+    ax0.cla()
+    assert not(ax1.yaxis_inverted())
+    ax1.cla()
+    # clearing the nonmaster should not touch limits
+    ax0.imshow(img)
+    ax1.plot(x,np.cos(x))
+    ax1.cla()
+    assert ax.yaxis_inverted()
 
 @image_comparison(baseline_images=["minorticks_on_rcParams_both"],
                   extensions=['png'])
