Fixed contour to now properly strip away units for unitized data on the x and y axes.

James Evans · James Evans · commit 1cc9ed6959ad · 2008-09-15T23:09:24.000Z
Unit registry now properly determines the registered converter to use for nested array data types.

svn path=/trunk/matplotlib/; revision=6097
diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py
@@ -724,8 +724,12 @@ def _check_xyz(self, args):
         Possible change: I think we should make and use an ArgumentError
         Exception class (here and elsewhere).
         '''
-        x = np.asarray(args[0], dtype=np.float64)
-        y = np.asarray(args[1], dtype=np.float64)
+        # We can strip away the x and y units
+        x = self.ax.convert_xunits( args[0] )
+        y = self.ax.convert_yunits( args[1] )
+
+        x = np.asarray(x, dtype=np.float64)
+        y = np.asarray(y, dtype=np.float64)
         z = ma.asarray(args[2], dtype=np.float64)
         if z.ndim != 2:
             raise TypeError("Input z must be a 2D array.")
diff --git a/lib/matplotlib/units.py b/lib/matplotlib/units.py
@@ -128,11 +128,8 @@ def get_converter(self, x):
 
         if converter is None and iterable(x):
             for thisx in x:
-                classx = getattr(thisx, '__class__', None)
-                break
-            if classx is not None:
-                converter = self.get(classx)
-
+                converter = self.get_converter( thisx )
+                if converter: break
 
         #DISABLED self._cached[idx] = converter
         return converter
