Changeset 1900

Timestamp:

20/12/06 12:34:52 (13 years ago)

Author:

domlowe

Message:

more on !referenceableGrid

Location:

TI02-CSML/branches/CSML2

Files:

• csmllibs/csmldataiface.py (modified) (1 diff)
• csmllibs/csmlfeaturetypes.py (modified) (4 diffs)
• parser.py (modified) (1 diff)

TI02-CSML/branches/CSML2/csmllibs/csmldataiface.py

@@ -340 +340 @@
         attValue=self.axisobj.attributes[att]
         return attValue
-
+    
     def getTimeUnits(self):
         #this does the same as getAxisAttribute, but is a separate function as different formats handle time differently.

TI02-CSML/branches/CSML2/csmllibs/csmlfeaturetypes.py

@@ -10 +10 @@
 import csml.csmllibs
 import sys
+
+class axisList(object):
+    #utitily class to store the relationships between CSML dimensions and grid axes.
+    #not used yet
+    def __init__(self):
+        self.dims={}
+    
+    def addDim(self, dimName, axisLabel, axesSpanned):
+        if type(axesSpanned) is not list:
+            axesSpanned=[axesSpanned]
+        self.dims[dimName]=[axisLabel, axesSpanned]
+    
+    def getAxisLabel(self, dimName):
+        return self.dims[dimName][0]
+    
+    def getAxesSpanned(self, dimName):
+        return self.dims[dimName][1]
+    
 
 class featureBuilder(object):
@@ -102 +120 @@
             numFeatures=len(allVarNames)
             #Create a GridSeriesFeature for each variable:
+            print 'TEST CODE'
+                
             for i in range(0, numFeatures):
                 DI.setVariable(allVarNames[i])
-                dimNames=DI.getVariableAxes()
+                print allVarNames[i]
+                #set up the axisList for use later
+                AL=axisList()
+                dimNames=DI.getVariableAxes()                
                 if len(dimNames) <= 2:
                     #it's an axis or bounds not a feature, try next variable
@@ -178 +201 @@
                     #store the rangeSet as an aggregatedArray
                     aa=cp.AggregatedArray()
-                    aa.arraySize=[]
-                    #aa.arraySize.append(arrSz)
-                    #aa.uom=strUom
+                    aa.arraySize=cp.csString(arrSz)
+                    aa.uom=cp.csString(strUom)
                     aa.aggType=cp.csString('new') #can it be anything else?
                     aa.aggIndex=cp.csString('1')
@@ -194 +216 @@
                     rs.aggregatedArray=aa
                 gsCoverage.rangeSet=rs
-
                 gsFeature.parameter=csml.parser.Phenomenon(href='http://badc.rl.ac.uk/localparams#%s'%allVarNames[i])
-                #gsFeature.parameter=csml.parser.Phenomenon()
                 gsFeature.value=gsCoverage
                 self.fms.append(gsFeature)

TI02-CSML/branches/CSML2/parser.py

@@ -221 +221 @@
     def __init__(self, text=None,**kwargs):
         if text != None:
+            if type(text) is not str:
+                text=str(text)
             self.CONTENT=text
         children={}