Changeset 1580

Timestamp:

13/10/06 12:56:42 (14 years ago)

Author:

domlowe

Message:

fixed bug with inline axis values

Location:

TI02-CSML/trunk/csml

Files:

• API/ops_GridSeriesFeature.py (modified) (5 diffs)
• csmllibs/csmlextra.py (modified) (1 diff)

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

@@ -1 +1 @@
 ''' ops_GridSeriesFeature  contains operations for GridSeriesFeatures'''
 
-from Numeric import *
 import csml.parser
 import csml.csmllibs.csmltime
@@ -35 +34 @@
     if isinstance(dc, csml.parser.Grid):
         for ordinate in dc.ordinates:
-            domaincomp[ordinate.definesAxis]=ordinate.axisValues.getData()
+            if isinstance(ordinate.axisValues,csml.parser.AbstractFileExtract):
+                domaincomp[ordinate.definesAxis]=ordinate.axisValues.getData()
+            else:
+                #build domain complement dictionary:
+                valList=[]
+                for val in ordinate.axisValues.split(','):
+                    valList.append(val)
+                domaincomp[ordinate.definesAxis]=valList
+                
     return domaincomp
 
@@ -67 +74 @@
     for key in dc.keys():
         if key == 'longitude': #how do we test if it is longitude properly?
-            print dc[key]
             for val in dc[key]:
                 if val < 0:
@@ -145 +151 @@
         god.definesAxis=key
         straxisValues=''
+        #now deal with each argument:
         
-        #now deal with each argument:
         if key in kwargs:
             if kwargs[key][0] < kwargs[key][1]:   
                 for val in dc[key]:
-                    if val >= kwargs[key][0]:
-                        if val <= kwargs[key] [1]:
-                            arraySize=arraySize+1
-                            straxisValues=straxisValues+ str(val) + ', '
+                    if val is not '':
+                        if float(val) >= kwargs[key][0]:
+                            print kwargs[key][1]
+                            if float(val) <= kwargs[key] [1]:
+                                arraySize=arraySize+1
+                                straxisValues=straxisValues+ str(val) + ', '
             else:#this if deals with selections such as longitude (330,30) where the lower limit is 'greater' than the upper limit in a mathematical sense.
                     for val in dc[key]:
-                        if val >= kwargs[key][0]:
-                            arraySize=arraySize+1
-                            straxisValues=straxisValues+ str(val) + ', '
+                        if val is not '':
+                            if val >= kwargs[key][0]:
+                                arraySize=arraySize+1
+                                straxisValues=straxisValues+ str(val) + ', '
                     for val in dc[key]:
-                        if val <= kwargs[key] [1]:
-                            arraySize=arraySize+1
-                            straxisValues=straxisValues+ str(val) + ', '
+                        if val is not '':
+                            if val <= kwargs[key] [1]:
+                                arraySize=arraySize+1
+                                straxisValues=straxisValues+ str(val) + ', '
         else: # this dimension has not been subsetted at all
             for val in dc[key]:
-                arraySize=arraySize+1
-                straxisValues=straxisValues+ str(val) + ', '
+                if val is not '':
+                    arraySize=arraySize+1
+                    straxisValues=straxisValues+ str(val) + ', '        
         totalArraySize=totalArraySize*arraySize
         god.axisValues=straxisValues[:-2]
@@ -188 +199 @@
     nc.addAxis('t',floatTimes,isTime=1,units=calunits,calendar=caltype)
     for ordinate in ordinates:
+        print ordinate.definesAxis
         lon,lat=None,None
         if ordinate.definesAxis=='longitude':

TI02-CSML/trunk/csml/csmllibs/csmlextra.py

@@ -46 +46 @@
     cleanstring = messystring[1:-1]
     cleanstring = cleanstring.replace("'",'')
+    #remove any carriage returns
+    cleanstring = cleanstring.replace("\n",'')
     return cleanstring