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

[brad at geodynamics.org]

Author: brad
Date: 2010-04-06 17:38:20 -0700 (Tue, 06 Apr 2010)
New Revision: 16498

Modified:
   cs/spatialdata-0.1/trunk/spatialdata/spatialdb/UniformDB.py
Log:
Permit nondimensional values in UniformDB.

Modified: cs/spatialdata-0.1/trunk/spatialdata/spatialdb/UniformDB.py
===================================================================
--- cs/spatialdata-0.1/trunk/spatialdata/spatialdb/UniformDB.py	2010-04-07 00:23:41 UTC (rev 16497)
+++ cs/spatialdata-0.1/trunk/spatialdata/spatialdb/UniformDB.py	2010-04-07 00:38:20 UTC (rev 16498)
@@ -76,9 +76,13 @@
     data = []
     units = []
     for x in self.inventory.data:
-      xdim = self.parser.parse(str(x))
-      data.append(float((xdim.value)))
-      units.append(xdim._strDerivation())
+      if len(str(x).split("*")) > 1:
+        xdim = self.parser.parse(str(x))
+        data.append(float((xdim.value)))
+        units.append(xdim._strDerivation())
+      else:
+        data.append(float(x))
+        units.append("none")
     self.setData(self.inventory.values, units, data)
     return
 
@@ -103,11 +107,14 @@
             % (self.label, len(params.values), len(params.data))
     try:
       for x in params.data:
-        xdim = self.parser.parse(str(x))
-        dataFloat = float(xdim.value)
+        if len(str(x).split("*")) > 1:
+          xdim = self.parser.parse(str(x))
+          dataFloat = float(xdim.value)
+        else:
+          dataFloat = float(x)
     except:
         raise ValueError, \
-              "'data' list must contain dimensioned values."
+              "'data' list must contain dimensioned or nondimensional values."
     return