fixed an xorig conversion bug

jdh2358 · jdh2358 · commit 9a5b7c172d6d · 2007-03-23T19:21:28.000Z
svn path=/trunk/matplotlib/; revision=3121
diff --git a/examples/units/evans_test2.py b/examples/units/evans_test2.py
@@ -0,0 +1,38 @@
+from basic_units import radians, degrees
+from pylab import figure, show, nx
+from matplotlib.cbook import iterable
+import math
+
+def cos( x ):
+   if ( iterable(x) ):
+      result = []
+      for val in x:
+         result.append( math.cos( val.convert_to( radians ).get_value() ) )
+      return result
+   else:
+      return math.cos( x.convert_to( radians ).get_value() )
+
+# the following command strips away the units and
+# therefore demonstrates nothing.  The valeus are
+# the same for both graphs.  In order to really
+# use the units, the list of values passed into
+# the plot function must be a unitized type.
+
+# x = nx.arange(0, 15, 0.01) * radians
+
+x = []
+for i in range(0, 1500):
+   x.append( i*0.01*radians )
+
+fig = figure()
+
+ax = fig.add_subplot(211)
+ax.plot(x, cos(x), xunits=radians)
+ax.set_xlabel('radians')
+
+ax = fig.add_subplot(212)
+ax.plot(x, cos(x), xunits=degrees)
+ax.set_xlabel('degrees')
+
+show()
+
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -227,16 +227,21 @@ def set_patchprops(self, fill_poly, **kwargs):
             func(val)
 
     def _xy_from_y(self, y):
-        y = ma.asarray(y)
+        try: y = ma.asarray(y)
+        except TypeError: return None, None
+        except ValueError: return None, None        
         if len(y.shape) == 1:
             y = y[:,newaxis]
         nr, nc = y.shape
         x = arange(nr)
         return x,y
 
     def _xy_from_xy(self, x, y):
-        x = ma.asarray(x)
-        y = ma.asarray(y)
+        try:
+            x = ma.asarray(x)
+            y = ma.asarray(y)
+        except TypeError: return None, None
+        except ValueError: return None, None        
         if len(x.shape) == 1:
             x = x[:,newaxis]
         if len(y.shape) == 1:
@@ -261,7 +266,7 @@ def _plot_1_arg(self, y, **kwargs):
         yorig = y
         x, y = self._xy_from_y(yorig)
 
-        multicol = y.shape[1]>1
+        multicol = x is not None and y is not None and y.shape[1]>1
 
         if multicol:
 
@@ -292,7 +297,7 @@ def _plot_2_args(self, tup2, **kwargs):
 
             linestyle, marker, color = _process_plot_format(fmt)
 
-            multicol = y.shape[1]>1
+            multicol = x is not None and y is not None and y.shape[1]>1
 
 
             def makeline(x, y):
@@ -317,7 +322,7 @@ def makeline(x, y):
 
             xorig, yorig = tup2
             x, y = self._xy_from_xy(xorig, yorig)
-            multicol = y.shape[1]>1
+            multicol = x is not None and y is not None and y.shape[1]>1
 
             def makeline(x, y):
                 color = self._get_next_cycle_color()
@@ -354,7 +359,7 @@ def _plot_3_args(self, tup3, **kwargs):
 
         xorig, yorig, fmt = tup3
         x, y = self._xy_from_xy(xorig, yorig)
-        multicol = y.shape[1]>1
+        multicol = x is not None and y is not None and y.shape[1]>1
 
         linestyle, marker, color = _process_plot_format(fmt)
 
