Revision: 6930
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6930&view=rev
Author: jrevans
Date: 2009-02-24 15:38:33 +0000 (Tue, 24 Feb 2009)
Log Message:
-----------
Updated to reflect updated unit conversion interface.
Modified Paths:
--------------
trunk/matplotlib/examples/units/basic_units.py
trunk/matplotlib/examples/units/date_support.py
trunk/matplotlib/examples/units/evans_test.py
Modified: trunk/matplotlib/examples/units/basic_units.py
===================================================================
--- trunk/matplotlib/examples/units/basic_units.py 2009-02-23 17:43:26 UTC
(rev 6929)
+++ trunk/matplotlib/examples/units/basic_units.py 2009-02-24 15:38:33 UTC
(rev 6930)
@@ -304,7 +304,8 @@
class BasicUnitConverter(units.ConversionInterface):
- def axisinfo(unit):
+ @staticmethod
+ def axisinfo(unit, axis):
'return AxisInfo instance for x and unit'
if unit==radians:
@@ -326,9 +327,8 @@
return units.AxisInfo(label=unit.unit.fullname)
return None
- axisinfo = staticmethod(axisinfo)
-
- def convert(val, unit):
+ @staticmethod
+ def convert(val, unit, axis):
if units.ConversionInterface.is_numlike(val):
return val
#print 'convert checking iterable'
@@ -336,15 +336,14 @@
return [thisval.convert_to(unit).get_value() for thisval in val]
else:
return val.convert_to(unit).get_value()
- convert = staticmethod(convert)
- def default_units(x):
+ @staticmethod
+ def default_units(x, axis):
'return the default unit for x or None'
if iterable(x):
for thisx in x:
return thisx.unit
return x.unit
- default_units = staticmethod(default_units)
Modified: trunk/matplotlib/examples/units/date_support.py
===================================================================
--- trunk/matplotlib/examples/units/date_support.py 2009-02-23 17:43:26 UTC
(rev 6929)
+++ trunk/matplotlib/examples/units/date_support.py 2009-02-24 15:38:33 UTC
(rev 6930)
@@ -8,7 +8,8 @@
class DateConverter(units.ConversionInterface):
- def axisinfo(unit):
+ @staticmethod
+ def axisinfo(unit, axis):
'return the unit AxisInfo'
if unit=='date':
majloc = dates.AutoDateLocator()
@@ -19,17 +20,16 @@
label='date',
)
else: return None
- axisinfo = staticmethod(axisinfo)
- def convert(value, unit):
+ @staticmethod
+ def convert(value, unit, axis):
if units.ConversionInterface.is_numlike(value): return value
return dates.date2num(value)
- convert = staticmethod(convert)
- def default_units(x):
+ @staticmethod
+ def default_units(x, axis):
'return the default unit for x or None'
return 'date'
- default_units = staticmethod(default_units)
units.registry[datetime.date] = DateConverter()
Modified: trunk/matplotlib/examples/units/evans_test.py
===================================================================
--- trunk/matplotlib/examples/units/evans_test.py 2009-02-23 17:43:26 UTC
(rev 6929)
+++ trunk/matplotlib/examples/units/evans_test.py 2009-02-24 15:38:33 UTC
(rev 6930)
@@ -24,7 +24,8 @@
class FooConverter:
- def axisinfo(unit):
+ @staticmethod
+ def axisinfo(unit, axis):
'return the Foo AxisInfo'
if unit==1.0 or unit==2.0:
return units.AxisInfo(
@@ -35,9 +36,9 @@
else:
return None
- axisinfo = staticmethod(axisinfo)
- def convert(obj, unit):
+ @staticmethod
+ def convert(obj, unit, axis):
"""
convert obj using unit. If obj is a sequence, return the
converted sequence
@@ -49,16 +50,15 @@
return [o.value(unit) for o in obj]
else:
return obj.value(unit)
- convert = staticmethod(convert)
- def default_units(x):
+ @staticmethod
+ def default_units(x, axis):
'return the default unit for x or None'
if iterable(x):
for thisx in x:
return thisx.unit
else:
return x.unit
- default_units = staticmethod(default_units)
units.registry[Foo] = FooConverter()
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
