applied Nadias x,y countour fix

jdh2358 · jdh2358 · commit 19df3fa88219 · 2005-01-14T18:42:57.000Z
svn path=/trunk/matplotlib/; revision=864
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,7 @@
 New entries should be added at the top
 
+2005-01-15 Added Nadia's x,y contour fix
+
 2005-01-12 Fixed set clip_on bug in artist - JDH
 
 2005-01-11 Reverted pythoninspect in tkagg - JDH
diff --git a/TODO b/TODO
@@ -625,3 +625,7 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
 -- tex_rotation svg line bug (clipping??)
 
 -- lag in release events makes key press nav difficult
+
+-- Jim's tick bug in non-interactive mode
+
+-- more flexible tick placement.
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -1000,7 +1000,10 @@ def contour(self, z,
         reg = ones((jmax,imax), Int32)
         reg[:,0]=0
         triangle = zeros((jmax,imax), Int32)
-        y, x = indices((jmax,imax), 'd')
+
+        if x == None and y == None:
+            y, x = indices((jmax,imax), 'd')
+
         rz = ravel(z)
         zmax = nxmax(rz)
         zmin = nxmin(rz)
