Changeset 1929

Timestamp:

02/01/07 10:28:45 (13 years ago)

Author:

domlowe

Message:

added !getData method to GridSeriesFeature (works for inline data only at the moment)

Location:

TI02-CSML/trunk/csml

Files:

• API/__init__.py (modified) (2 diffs)
• API/ops_GridSeriesFeature.py (modified) (1 diff)
• testfiles/apicalls.py (modified) (2 diffs)

TI02-CSML/trunk/csml/API/__init__.py

@@ -33 +33 @@
 
 ##AbstractFeature methods:
-#addMethods(csml.parser.AbstractFeature, [ops_AbstractFeature.testmethod, ops_AbstractFeature.getAllowedSubsettings])
+addMethods(csml.parser.AbstractFeature, [ops_AbstractFeature.testmethod, ops_AbstractFeature.getAllowedSubsettings])
 
 ##PointFeature methods:
@@ -51 +51 @@
 
 ##GridSeriesFeature methods:
-#addMethods(csml.parser.GridSeriesFeature,[ops_GridFeature.testmethod, ops_GridSeriesFeature.getAllowedSubsettings,ops_GridSeriesFeature.getDomainReference,ops_GridSeriesFeature.getDomainComplement,ops_GridSeriesFeature.getDomain,ops_GridSeriesFeature.subsetToGridSeries])
+addMethods(csml.parser.GridSeriesFeature,[ops_GridFeature.testmethod,ops_GridSeriesFeature.getDomain,ops_GridSeriesFeature.subsetToGridSeries])
 
 ##TrajectoryFeature methods:

TI02-CSML/trunk/csml/API/ops_GridSeriesFeature.py

@@ -15 +15 @@
     return ['subsetToGridSeries']  #other operations
 
+
 def getDomain(self):
-    #need some sort of domain
-    pass
+    #returns domain as a dictionary of ordinates {name: [values], ...}
+    domain={}
+    for gridOrd in self.value.gridSeriesDomain.coordTransformTable.gridOrdinates:
+        name=gridOrd.coordAxisLabel.CONTENT
+        if isinstance(gridOrd.coordAxisValues, csml.parser.FileExtract):
+            #not tested with file extracts yet: (01/01/07)
+            domain[name]=gridOrd.coordAxisValues.getData()
+        else:
+            vals=gridOrd.coordAxisValues.coordinateList.CONTENT
+            valList=[]
+            for val in vals.split(','):  #remove commas
+                valList.append(val)
+            domain[name]=valList
+    return domain
 
 def subsetToGridSeries(self,   csmlpath=None, ncpath=None,**kwargs):

TI02-CSML/trunk/csml/testfiles/apicalls.py

@@ -1 +1 @@
 '''apicalls.py  - test the api'''
 
-import csml
+import csml,sys
 
-f='./testfiles/gridseries/testout.xml'
+f='./gridseries/testout.xml'
 
 #Initialise the CSML container
@@ -25 +25 @@
 print feature.id
 print feature.description
+
+#new style domain:
+print feature.getDomain()
+sys.exit()
 
 #get the domain of the feature