[cig-commits] r15169 - cs/spatialdata-0.1/trunk/spatialdata/spatialdb

[brad at geodynamics.org]

Author: brad
Date: 2009-06-09 23:13:18 -0700 (Tue, 09 Jun 2009)
New Revision: 15169

Modified:
   cs/spatialdata-0.1/trunk/spatialdata/spatialdb/UniformDB.py
Log:
Fixed bug in parsing data units.

Modified: cs/spatialdata-0.1/trunk/spatialdata/spatialdb/UniformDB.py
===================================================================
--- cs/spatialdata-0.1/trunk/spatialdata/spatialdb/UniformDB.py	2009-06-10 05:24:07 UTC (rev 15168)
+++ cs/spatialdata-0.1/trunk/spatialdata/spatialdb/UniformDB.py	2009-06-10 06:13:18 UTC (rev 15169)
@@ -60,6 +60,8 @@
     Constructor.
     """
     SpatialDBObj.__init__(self, name)
+    from pyre.units import parser
+    self.parser = parser()
     return
 
 
@@ -74,8 +76,9 @@
     data = []
     units = []
     for x in self.inventory.data:
-      data.append(float(x.value))
-      units.append(x._strDerivation())
+      xdim = self.parser.parse(str(x))
+      data.append(float((xdim.value)))
+      units.append(xdim._strDerivation())
     self.setData(self.inventory.values, units, data)
     return
 
@@ -100,10 +103,11 @@
             % (self.label, len(params.values), len(params.data))
     try:
       for x in params.data:
-        dataFloat = float(x.value)
+        xdim = self.parser.parse(str(x))
+        dataFloat = float(xdim.value)
     except:
         raise ValueError, \
-              "'data' list must contain floating point values."
+              "'data' list must contain dimensioned values."
     return