Changeset 1580
- Timestamp:
- 13/10/06 12:56:42 (15 years ago)
- Location:
- TI02-CSML/trunk/csml
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
TI02-CSML/trunk/csml/API/ops_GridSeriesFeature.py
r1557 r1580 1 1 ''' ops_GridSeriesFeature contains operations for GridSeriesFeatures''' 2 2 3 from Numeric import *4 3 import csml.parser 5 4 import csml.csmllibs.csmltime … … 35 34 if isinstance(dc, csml.parser.Grid): 36 35 for ordinate in dc.ordinates: 37 domaincomp[ordinate.definesAxis]=ordinate.axisValues.getData() 36 if isinstance(ordinate.axisValues,csml.parser.AbstractFileExtract): 37 domaincomp[ordinate.definesAxis]=ordinate.axisValues.getData() 38 else: 39 #build domain complement dictionary: 40 valList=[] 41 for val in ordinate.axisValues.split(','): 42 valList.append(val) 43 domaincomp[ordinate.definesAxis]=valList 44 38 45 return domaincomp 39 46 … … 67 74 for key in dc.keys(): 68 75 if key == 'longitude': #how do we test if it is longitude properly? 69 print dc[key]70 76 for val in dc[key]: 71 77 if val < 0: … … 145 151 god.definesAxis=key 146 152 straxisValues='' 153 #now deal with each argument: 147 154 148 #now deal with each argument:149 155 if key in kwargs: 150 156 if kwargs[key][0] < kwargs[key][1]: 151 157 for val in dc[key]: 152 if val >= kwargs[key][0]: 153 if val <= kwargs[key] [1]: 154 arraySize=arraySize+1 155 straxisValues=straxisValues+ str(val) + ', ' 158 if val is not '': 159 if float(val) >= kwargs[key][0]: 160 print kwargs[key][1] 161 if float(val) <= kwargs[key] [1]: 162 arraySize=arraySize+1 163 straxisValues=straxisValues+ str(val) + ', ' 156 164 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. 157 165 for val in dc[key]: 158 if val >= kwargs[key][0]: 159 arraySize=arraySize+1 160 straxisValues=straxisValues+ str(val) + ', ' 166 if val is not '': 167 if val >= kwargs[key][0]: 168 arraySize=arraySize+1 169 straxisValues=straxisValues+ str(val) + ', ' 161 170 for val in dc[key]: 162 if val <= kwargs[key] [1]: 163 arraySize=arraySize+1 164 straxisValues=straxisValues+ str(val) + ', ' 171 if val is not '': 172 if val <= kwargs[key] [1]: 173 arraySize=arraySize+1 174 straxisValues=straxisValues+ str(val) + ', ' 165 175 else: # this dimension has not been subsetted at all 166 176 for val in dc[key]: 167 arraySize=arraySize+1 168 straxisValues=straxisValues+ str(val) + ', ' 177 if val is not '': 178 arraySize=arraySize+1 179 straxisValues=straxisValues+ str(val) + ', ' 169 180 totalArraySize=totalArraySize*arraySize 170 181 god.axisValues=straxisValues[:-2] … … 188 199 nc.addAxis('t',floatTimes,isTime=1,units=calunits,calendar=caltype) 189 200 for ordinate in ordinates: 201 print ordinate.definesAxis 190 202 lon,lat=None,None 191 203 if ordinate.definesAxis=='longitude': -
TI02-CSML/trunk/csml/csmllibs/csmlextra.py
r1352 r1580 46 46 cleanstring = messystring[1:-1] 47 47 cleanstring = cleanstring.replace("'",'') 48 #remove any carriage returns 49 cleanstring = cleanstring.replace("\n",'') 48 50 return cleanstring 49 51
Note: See TracChangeset
for help on using the changeset viewer.