hanged the order of arguments for unit.ConverterInterface class.

James Evans · James Evans · commit 0f17bd2f129c · 2009-01-29T17:57:43.000Z
svn path=/trunk/matplotlib/; revision=6849
diff --git a/examples/units/basic_units.py b/examples/units/basic_units.py
@@ -98,6 +98,9 @@ class TaggedValue (object):
               '__sub__':ConvertAllProxy,
               '__mul__':ConvertAllProxy,
               '__rmul__':ConvertAllProxy,
+              '__cmp__':ConvertAllProxy,
+              '__lt__':ConvertAllProxy,
+              '__gt__':ConvertAllProxy,
               '__len__':PassThroughProxy}
 
   def __new__(cls, value, unit):
@@ -228,7 +231,7 @@ def get_conversion_fn(self, unit):
     return self.conversions[unit]
 
   def convert_value_to(self, value, unit):
-      #print 'convert value to: value ="%s", unit="%s"'%(value, type(unit)), self.conversions
+      #print 'convert value to: value ="%s", unit="%s"'%(value, type(unit)), self.conversions  
       conversion_fn = self.conversions[unit]
       ret = conversion_fn(value)
       return ret
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -939,7 +939,7 @@ def update_units(self, data):
         converter = munits.registry.get_converter(data)
         if converter is None: return False
         self.converter = converter
-        default = self.converter.default_units(self, data)
+        default = self.converter.default_units(data, self)
         #print 'update units: default="%s", units=%s"'%(default, self.units)
         if default is not None and self.units is None:
             self.set_units(default)
@@ -955,7 +955,7 @@ def _update_axisinfo(self):
         if self.converter is None:
             return
 
-        info = self.converter.axisinfo(self, self.units)
+        info = self.converter.axisinfo(self.units, self)
         if info is None:
             return
         if info.majloc is not None and self.major.locator!=info.majloc:
@@ -982,7 +982,7 @@ def convert_units(self, x):
             #print 'convert_units returning identity: units=%s, converter=%s'%(self.units, self.converter)
             return x
 
-        ret =  self.converter.convert(self, x, self.units)
+        ret =  self.converter.convert(x, self.units, self)
         #print 'convert_units converting: axis=%s, units=%s, converter=%s, in=%s, out=%s'%(self, self.units, self.converter, x, ret)
         return ret
 
diff --git a/lib/matplotlib/dates.py b/lib/matplotlib/dates.py
@@ -1007,51 +1007,52 @@ class DateConverter(units.ConversionInterface):
     """The units are equivalent to the timezone."""
 
     @staticmethod
-    def axisinfo(axis, unit):
+    def axisinfo(unit, axis):
         'return the unit AxisInfo'
         # make sure that the axis does not start at 0
-        ax = axis.axes
-
-        if axis is ax.get_xaxis():
-            xmin, xmax = ax.dataLim.intervalx
-            if xmin==0.:
-                # no data has been added - let's set the default datalim.
-                # We should probably use a better proxy for the datalim
-                # have been updated than the ignore setting
-                dmax = today = datetime.date.today()
-                dmin = today-datetime.timedelta(days=10)
-
-                ax._process_unit_info(xdata=(dmin, dmax))
-                dmin, dmax = ax.convert_xunits([dmin, dmax])
-
-                ax.viewLim.intervalx = dmin, dmax
-                ax.dataLim.intervalx = dmin, dmax
-        elif axis is ax.get_yaxis():
-            ymin, ymax = ax.dataLim.intervaly
-            if ymin==0.:
-                # no data has been added - let's set the default datalim.
-                # We should probably use a better proxy for the datalim
-                # have been updated than the ignore setting
-                dmax = today = datetime.date.today()
-                dmin = today-datetime.timedelta(days=10)
-
-                ax._process_unit_info(ydata=(dmin, dmax))
-                dmin, dmax = ax.convert_yunits([dmin, dmax])
-
-                ax.viewLim.intervaly = dmin, dmax
-                ax.dataLim.intervaly = dmin, dmax
+        if axis:
+            ax = axis.axes
+
+            if axis is ax.get_xaxis():
+                xmin, xmax = ax.dataLim.intervalx
+                if xmin==0.:
+                    # no data has been added - let's set the default datalim.
+                    # We should probably use a better proxy for the datalim
+                    # have been updated than the ignore setting
+                    dmax = today = datetime.date.today()
+                    dmin = today-datetime.timedelta(days=10)
+
+                    ax._process_unit_info(xdata=(dmin, dmax))
+                    dmin, dmax = ax.convert_xunits([dmin, dmax])
+
+                    ax.viewLim.intervalx = dmin, dmax
+                    ax.dataLim.intervalx = dmin, dmax
+            elif axis is ax.get_yaxis():
+                ymin, ymax = ax.dataLim.intervaly
+                if ymin==0.:
+                    # no data has been added - let's set the default datalim.
+                    # We should probably use a better proxy for the datalim
+                    # have been updated than the ignore setting
+                    dmax = today = datetime.date.today()
+                    dmin = today-datetime.timedelta(days=10)
+
+                    ax._process_unit_info(ydata=(dmin, dmax))
+                    dmin, dmax = ax.convert_yunits([dmin, dmax])
+
+                    ax.viewLim.intervaly = dmin, dmax
+                    ax.dataLim.intervaly = dmin, dmax
 
         majloc = AutoDateLocator(tz=unit)
         majfmt = AutoDateFormatter(majloc, tz=unit)
         return units.AxisInfo( majloc=majloc, majfmt=majfmt, label='' )
 
     @staticmethod
-    def convert(axis, value, unit):
+    def convert(value, unit, axis):
         if units.ConversionInterface.is_numlike(value): return value
         return date2num(value)
 
     @staticmethod
-    def default_units(axis, x):
+    def default_units(x, axis):
         'Return the default unit for *x* or None'
         return None
 
diff --git a/lib/matplotlib/units.py b/lib/matplotlib/units.py
@@ -69,17 +69,17 @@ class ConversionInterface:
     sequences) and convert them to values mpl can use
     """
     @staticmethod
-    def axisinfo(axis, unit):
+    def axisinfo(unit, axis):
         'return an units.AxisInfo instance for axis with the specified units'
         return None
 
     @staticmethod
-    def default_units(axis, x):
+    def default_units(x, axis):
         'return the default unit for x or None for the given axis'
         return None
 
     @staticmethod
-    def convert(axis, obj, unit):
+    def convert(obj, unit, axis):
         """
         convert obj using unit for the specified axis.  If obj is a sequence,
         return the converted sequence.  The ouput must be a sequence of scalars
