[cig-commits] r16137 - in cs/spatialdata-0.1/trunk/spatialdata/spatialdb: . generator

[brad at geodynamics.org]

Author: brad
Date: 2010-01-15 14:08:42 -0800 (Fri, 15 Jan 2010)
New Revision: 16137

Modified:
   cs/spatialdata-0.1/trunk/spatialdata/spatialdb/SimpleIO.py
   cs/spatialdata-0.1/trunk/spatialdata/spatialdb/SimpleIOAscii.py
   cs/spatialdata-0.1/trunk/spatialdata/spatialdb/generator/Geometry.py
Log:
Changed dictionary for output of a simple db. Use points instead of locs as key.

Modified: cs/spatialdata-0.1/trunk/spatialdata/spatialdb/SimpleIO.py
===================================================================
--- cs/spatialdata-0.1/trunk/spatialdata/spatialdb/SimpleIO.py	2010-01-15 22:07:58 UTC (rev 16136)
+++ cs/spatialdata-0.1/trunk/spatialdata/spatialdb/SimpleIO.py	2010-01-15 22:08:42 UTC (rev 16137)
@@ -82,7 +82,7 @@
     """
     Check consistency of database data.
     """
-    (numLocs, spaceDim) = data['locs'].shape
+    (numLocs, spaceDim) = data['points'].shape
     cs = data['coordsys']
     if spaceDim != cs.spaceDim():
       raise ValueError, \

Modified: cs/spatialdata-0.1/trunk/spatialdata/spatialdb/SimpleIOAscii.py
===================================================================
--- cs/spatialdata-0.1/trunk/spatialdata/spatialdb/SimpleIOAscii.py	2010-01-15 22:07:58 UTC (rev 16136)
+++ cs/spatialdata-0.1/trunk/spatialdata/spatialdb/SimpleIOAscii.py	2010-01-15 22:08:42 UTC (rev 16137)
@@ -42,7 +42,7 @@
     Write database to file.
 
     @param data Dictionary of the following form:
-      data = {'locs': 2-D array (numLocs, spaceDim),
+      data = {'points': 2-D array (numLocs, spaceDim),
               'coordsys': Coordinate system associated with locations,
               'data_dim': Dimension of spatial distribution,
               'values': [{'name': Name of value,
@@ -53,7 +53,7 @@
 
     self._validateData(data)
 
-    (numLocs, spaceDim) = data['locs'].shape
+    (numLocs, spaceDim) = data['points'].shape
     dataDim = data['data_dim']
     numValues = len(data['values'])    
     names = []
@@ -69,7 +69,7 @@
     from spatialdb import SimpleDBData
     dbData = SimpleDBData()
     dbData.allocate(numLocs, numValues, spaceDim, dataDim)
-    dbData.coordinates(data['locs'])
+    dbData.coordinates(data['points'])
     dbData.data(values)
     dbData.names(names)
     dbData.units(units)

Modified: cs/spatialdata-0.1/trunk/spatialdata/spatialdb/generator/Geometry.py
===================================================================
--- cs/spatialdata-0.1/trunk/spatialdata/spatialdb/generator/Geometry.py	2010-01-15 22:07:58 UTC (rev 16136)
+++ cs/spatialdata-0.1/trunk/spatialdata/spatialdb/generator/Geometry.py	2010-01-15 22:08:42 UTC (rev 16137)
@@ -81,8 +81,7 @@
     """
     Read geometry.
     """
-    mesh = self.reader.unpickle()
-    self.vertices = mesh.vertices
+    self.vertices = self.reader.read()
     self.coordsys.initialize()
     return