Changeset 1660

Timestamp:

02/11/06 09:36:52 (11 years ago)

Author:

astephen

Message:

Version with overlay of trajectories on top of model fields draft version working before any rigourous testing.

Location:

TI04-geosplat/trunk

Files:

• MANIFEST (modified) (1 diff)
• cgi/splatui (modified) (1 diff)
• gss/bin/GSWSInterface.py (modified) (2 diffs)
• install.conf (modified) (4 diffs)
• install.conf.orig (added)
• install.sh (modified) (1 diff)
• pygsc/DisplayManager.py (modified) (4 diffs)
• pygsc/clientConfig.py (modified) (3 diffs)
• pygsc/clientConfig.py.bak (added)
• pygsc/jsFunctions.py (added)
• pygsc/version.py (modified) (1 diff)
• pygss/CombinedPlotManager.py (added)
• pygss/GSController.py (modified) (4 diffs)
• pygss/OptionHandler.py (modified) (16 diffs)
• pygss/OutputManager.py (modified) (7 diffs)
• pygss/PlotClasses.py (modified) (7 diffs)
• pygss/VariableAnalyser.py (modified) (14 diffs)
• pygss/__init__.py (modified) (1 diff)
• pygss/common.py (modified) (2 diffs)
• pygss/output_20061016120007.pdf (added)
• pygss/serverConfig.py (modified) (3 diffs)
• pygss/serverConfig.py.bak (added)
• pygss/version.py (modified) (1 diff)
• setup.py (modified) (3 diffs)

TI04-geosplat/trunk/MANIFEST

@@ -9 +9 @@
 pygsc/clientConfig.py
 pygsc/common.py
+pygsc/jsFunctions.py
 pygsc/localRules.py
 pygsc/version.py

TI04-geosplat/trunk/cgi/splatui

@@ -223 +223 @@
                 self.args["targetPage"]="VariableSelectionPage"
                 fileURIs=self.args["fileURIList"].split()
-                (optionCategories, options, optionStrings, secureToken)= \
-                                 self.server.callServerMethod("provideFileURIs", 
-                                     [self.sessionID, self.secureToken, fileURIs])      
+                resp=self.server.callServerMethod("provideFileURIs", 
+                                     [self.sessionID, self.secureToken, fileURIs]) 
+                if zsiv>=2.0:
+                        resp=resp[0]
+                (optionCategories, options, optionStrings, secureToken)=apply(self._cleanOptsTuple, resp)               
             else:
                 pass                                        

TI04-geosplat/trunk/gss/bin/GSWSInterface.py

@@ -254 +254 @@
         controller=GSController(args)
     except Exception, error:
+        print "HHHHHHHHHHHHHHHHHHHHH", str(error)
         return str(error)   
 
@@ -319 +320 @@
     
     exclusions=("callMethod", "secureToken", "optionCategoryRequested", 
-                "action", "targetPage")
+                "action", "targetPage", "varDict")
     for key in keylist:
         if req[key]!="" and key not in exclusions:  summaryString=summaryString+("%s:\t%s\n" % (key, req[key]))

TI04-geosplat/trunk/install.conf

@@ -27 +27 @@
 # "/usr/local/gss" is recommended but you can change it as 
 # you wish.
-BASEDIR="/home/as56/abstractWebService/gss"
+BASEDIR="/usr/local/test/gss"
 
 # OUTPUT_DIR:
 # The full path on the local machine of the output directory.
-OUTPUT_DIR="/srv/www/htdocs/gs/output"
+OUTPUT_DIR="/home/as56/apache/htdocs/gs/output"
 
 # OUTPUT_DIR_URL:
@@ -90 +90 @@
 # "/usr/local/gsc" is recommended but you can change it as 
 # you wish.
-BASEDIR="/home/as56/abstractWebService/gsc"
+BASEDIR="/usr/local/test/gsc"
 
 # STATIC_WEBSERVER_URL_PATH
@@ -98 +98 @@
 # STATIC_WEBSERVER_LOCAL_PATH
 # Location on the local machine of the webserver top level directory.
-STATIC_WEBSERVER_LOCAL_PATH="/srv/www/htdocs"
+STATIC_WEBSERVER_LOCAL_PATH="/home/as56/apache/htdocs"
 
 # WEB_EXTRAS_URL_PATH:
@@ -118 +118 @@
 # "/srv/www/cgi-bin/splatui" is likely on a SUSE system but
 # you are free to rename this as you wish.
-CGI_SCRIPT_LOCAL_PATH="/srv/www/cgi-bin/splatui"
+CGI_SCRIPT_LOCAL_PATH="/home/as56/apache/cgi-bin/splatui"
 
 # OUTPUT_DIR_LOCAL_PATH

TI04-geosplat/trunk/install.sh

@@ -1 @@
-v="0.3.0"
+v="0.3.1"
 rm -rR *tar *gz README.txt *conf gs? pygs? pygs?-?.? pygs?-?-?.? cgi web_extras
 

TI04-geosplat/trunk/pygsc/DisplayManager.py

@@ -18 +18 @@
 from clientConfig import *
 from common import *
+import jsFunctions
 
 class DisplayManager:
@@ -64 +65 @@
         print """<P>Please provide a list of files (by full path on the GeoSPlAT 
               server network) that you would like to visualise. Please type each new file 
-              a new line in the box below."""
+              path on a new line in the box below."""
                       
 
@@ -226 +227 @@
                       
         # Second time around display the multi-variable options
-        multiVarLine="""<TR><TD><B>MULTI-VARIABLE OPTIONS:</B>"""
+        multiVarLine="""<TR><TD CLASS="tablestyle"><B><FONT COLOR="black">MULTIPLE VARIABLE OPTIONS:</FONT></B>"""
+
         optCounter=0
         for option in options:
@@ -274 +276 @@
                    ("<B>Axis ID</B>", "<B>Long name</B>", "<B>Length</B>", "<B>Usage in plots</B>")
         
-
+        # Insert javascript functions to check mutually exclusive radio selection
+        nAxes=len(options)
+        indexStringForJavascript=str(range(nAxes))
+        print jsFunctions.js_animSelectionFunctions % indexStringForJavascript
+        
         checkedStrings=[[" CHECKED","",""], [""," CHECKED",""], ["",""," CHECKED"], ["","",""],["","",""],["","",""],["","",""]]
         for i in range(len(options)):
             print """<TR><TD>%s</TD><TD>%s</TD><TD>%s</TD><TD>%s&nbsp;%s&nbsp;%s&nbsp;</TD></TR>""" % \
                   (options[i][0], optionStrings[i][0], options[i][1], 
-                  """<INPUT TYPE="Radio" NAME="axisLoopForAnimation" VALUE="%s"%s> Loop""" % (options[i][0], checkedStrings[i][0]), 
-                  """<INPUT TYPE="Radio" NAME="axisYForAnimation" VALUE="%s""%s> Y""" % (options[i][0], checkedStrings[i][1]),            
-                  """<INPUT TYPE="Radio" NAME="axisXForAnimation" VALUE="%s""%s> X""" % (options[i][0], checkedStrings[i][2]))
+                  """<INPUT TYPE="Radio" NAME="axisLoopForAnimation" onclick="return validateAnimSelections('axisLoopForAnimation')" VALUE="%s"%s> Loop""" % (options[i][0], checkedStrings[i][0]), 
+                  """<INPUT TYPE="Radio" NAME="axisYForAnimation" onclick="return validateAnimSelections('axisYForAnimation')" VALUE="%s""%s> Y""" % (options[i][0], checkedStrings[i][1]),               
+                  """<INPUT TYPE="Radio" NAME="axisXForAnimation" onclick="return validateAnimSelections('axisXForAnimation')" VALUE="%s""%s> X""" % (options[i][0], checkedStrings[i][2]))
         
         print "</TABLE>"

TI04-geosplat/trunk/pygsc/clientConfig.py

@@ -115 +115 @@
 # STATIC_WEBSERVER_LOCAL_PATH
 # Location on the local machine of the webserver top level directory.
-STATIC_WEBSERVER_LOCAL_PATH="/srv/www/htdocs"
+STATIC_WEBSERVER_LOCAL_PATH="/home/as56/apache/htdocs"
 
 # WEB_EXTRAS_URL_PATH:
@@ -135 +135 @@
 # "/srv/www/cgi-bin/splatui" is likely on a SUSE system but
 # you are free to rename this as you wish.
-CGI_SCRIPT_LOCAL_PATH="/srv/www/cgi-bin/splatui"
+CGI_SCRIPT_LOCAL_PATH="/home/as56/apache/cgi-bin/splatui"
 
 # TOKEN_VALID_LIFETIME:
@@ -153 +153 @@
 # "/usr/local/gsc" is recommended but you can change it as 
 # you wish.
-BASEDIR="/home/as56/abstractWebService/gsc"
+BASEDIR="/usr/local/test/gsc"
 
 # OUTPUT_DIR_LOCAL_PATH
 # The full path on the local machine of the output directory.
-OUTPUT_DIR_LOCAL_PATH=os.path.join(STATIC_WEBSERVER_LOCAL_PATH, "output")
+OUTPUT_DIR_LOCAL_PATH=os.path.join(STATIC_WEBSERVER_LOCAL_PATH, "gs/output")
 
 # OUTPUT_DIR_URL_PATH:
 # The URL address of the OUTPUT_DIR_LOCAL_PATH
-OUTPUT_DIR_URL_PATH=os.path.join(STATIC_WEBSERVER_URL_PATH, "output")
+OUTPUT_DIR_URL_PATH=os.path.join(STATIC_WEBSERVER_URL_PATH, "gs/output")
 
 # LOGO_DIR:

TI04-geosplat/trunk/pygsc/version.py

@@ -11 +11 @@
 """
 
-version="0.3.0"
+version="0.3.1"

TI04-geosplat/trunk/pygss/GSController.py

@@ -136 +136 @@
                     raise Exception, error
                             
-                try:        
-                    self._createOutput()            
+                try:                    
+                    self._createOutput()           
                     self.logger=LogManager(self.bag)        
                     self.bag["status"]="complete"       
@@ -250 +250 @@
         response to the current request.
         """
+        
         if keyPatternMatch(self.bag, "fileURI")==0:
             print self.bag
@@ -255 +256 @@
             return
             
-        self.options=OptionHandler(self.bag["userRoles"], self.username, self.bag).options         
+        optionHandler=OptionHandler(self.bag["userRoles"], self.username, self.bag)
+        self.options=optionHandler.options
+        if hasattr(optionHandler, "varDict"):
+            self.bag["varDict"]=optionHandler.varDict
+             
         return
         
@@ -310 +315 @@
         self.bag["outputURLPath"]=outman.URLPath
     
+if __name__=="__main__":
+    print "Trying to plot trajectory over model field...\n"
+    b=GSController({'getOutput':"getOutput", 'status': 'constructing', 'username': 'undefined', 'outputURLPath': 'http://localhost/gs/output/output_20061018074443.gif', 'graphicalOutputType': 'MultipleTrajectoriesOver2DLatLonPlot_1.5-2.1', 'projection': 'standard', 'proceed': 'Proceed', 'fileURIList': ['/data/traj.nc', '/data/var2.nc'], 'userRoles': [], 'fileVariable_1.5': 'temp', 'varDict': {'2.1': {'domain': {'latitude': ['latitude', 'latitude', [-90, 90]], 'grots': [['2DLatLonPlot', "2D Lat-Lon Plot for variable 'var2' from file: '/data/var2.nc'"]], 'ordered_axes': ['time', 'latitude', 'longitude'], 'longitude': ['longitude', 'longitude', [0, 355]], 'time': ['time', 'time', [0, 0]]}, 'id': 'var2'}, '1.1': {'domain': {'grots': [['TrajectoriesOverMap', "Trajectories plotted on map for variable 'lat' from file: '/data/traj.nc'"], ['2DPlot', "2D Plot for variable 'lat' from file: '/data/traj.nc'"]], 'bbox': (67.399993896484375, 22.500001907348633, 42.299999237060547, 126.36080169677734), 'parcel': ['parcel', 'unrecognised', [0.0, 1.0]], 'ordered_axes': ['time', 'parcel'], 'time': ['time', 'time', [0.0, 432000.0]]}, 'id': 'lat'}, '1.5-2.1': {'domain': {'grots': [['MultipleTrajectoriesOver2DLatLonPlot', "Multiple Trajectories for variable 'temp' plotted over 2D Plot for variable 'var2'"]], 'bbox': (90, 0, -90, 355)}}}, 'sessionID': 'session_20061018074431451', 'fileVariable_2.1': 'var2', 'plotType': 'MultipleTrajectoryOverBoxfillLinear', 'mapArea':'surroundingArea', 'outputFilePath': '/home/as56/apache/htdocs/gs/output/output_20061018074443.gif', 'fileFormat': 'gif', 'accessTime': 1161157483.026027, 'imageSize': '800x600'})
+    
+    #({'mapArea':"global", 'outputURLPath': 'http://localhost/gs/output/output_20061004002742.gif', 'graphicalOutputType': 'MultipleTrajectoriesOver2DLatLonPlot_1.1-2.1', 'projection': 'standard', 'getOutput':"getOutput", 'fileURIList': ['/data/traj.nc','/data/var2.nc'], 'fileVariable_1.1': 'temp', 'fileVariable_2.1':'var2', 'sessionID': 'session_20061004002735159', 'plotType': 'MultipleTrajectoryOverBoxfillLinear', 'outputFilePath': '/home/as56/apache/htdocs/gs/output/output_20061004002742.gif', 'fileFormat': 'gif', 'imageSize': '800x600'})
+    sys.exit()
+        
+        
+    GSController({'username': 'undefined', 'outputURLPath': 'http://localhost/gs/output/output_20061004002742.gif', 'graphicalOutputType': 'TrajectoriesOverMap_1.1', 'projection': 'standard', 'getOutput':"getOutput", 'fileURIList': ['/data/traj.nc'], 'userRoles': [], 'fileVariable_1.1': 'lat', 'sessionID': 'session_20061004002735159', 'plotType': 'MultipleTrajectory', 'outputFilePath': '/home/as56/apache/htdocs/gs/output/output_20061004002742.gif', 'fileFormat': 'gif', 'accessTime': 1159921662.625607, 'imageSize': '800x600'})

TI04-geosplat/trunk/pygss/OptionHandler.py

@@ -25 +25 @@
 from GSErrors import *
 from VariableAnalyser import *
+from CombinedPlotManager import *
 
 class OptionHandler:
@@ -68 +69 @@
                     raise GSSecurityError, "User does not have permission to access file: "+fileURI
                 
-        print "\n\n\n", self.bag
+        #print "\n\n\n", self.bag
         # User is allowed to see data so need work out which options to provide
         if keyPatternMatch(self.bag, "fileVariable_")==0:       
@@ -74 +75 @@
                     
         elif keyPatternMatch(self.bag, "graphicalOutputType")==0:       
-            self.options=self._analyseChosenVariables()         
+            self.options=self._analyseChosenVariables() 
         
         elif type(self.bag["graphicalOutputType"])==type([1,2]):
@@ -90 +91 @@
         else:   
             self.options=[[[]],[[]],[[]]]
-                
+        
                 
     def _getFileVariableLists(self, fileURIList):
@@ -157 +158 @@
         optionStrings=[]
         
+        # Will need external caller to access and save varDict so make instance attribute
+        self.varDict={}
+        
         # Get list of selected variables
-
         for key in self.bag.keys():
             match=fvpattern.match(key)
@@ -185 +188 @@
                 analyser=VariableAnalyser(fileURI, varID)
                 plotOpts=analyser.plotOpts
-
-                optionCategories.append("graphicalOutputType_%s.%s" % (fileIndex, varIndex))            
+                domainDict=analyser.domainDict
+                
+                suffix="%s.%s" % (fileIndex, varIndex)
+                
+                self.varDict[suffix]={"id":varID,
+                                      "domain":domainDict}
+
+                optionCategories.append("graphicalOutputType_%s" % suffix)              
                 optsSubList=[]
                 optsStringsSubList=[]
@@ -196 +205 @@
                 options.append(optsSubList[:])
                 optionStrings.append(optsStringsSubList[:])
-
+        
+        # Call combined plot manager to work out what plots can be combined
+        # via overlays or combining parameters
+        cbm=CombinedPlotManager(self.varDict, fileList=self.bag["fileURIList"])
+        combinedOptions=cbm.combinedPlotOptions
+        if len(combinedOptions)>0:
+            for co in combinedOptions:
+                optionCategories+=[co[0]]
+                options+=[co[1]]
+                optionStrings+=[co[2]]
+            
+        #optionCategories.append("graphicalOutputType_1.1-2.1")
+        #options.append(["MultipleTrajectoriesOver2DLatLonPlot"])
+        #optionStrings.append(["""DONT FORGET TO COMBINE STIRNGS with 'Overlay of' dada on blahblah... Multiple Trajectories for variable 'sdfsd' from file 'dfsd' plotted over 2D Plot for variable 'var2' from file  'sdfdsfsf'"""])  
         return [[optionCategories], [options], [optionStrings]]
              
@@ -206 +228 @@
         """      
         # Get items needed for working out which file to open
-        (fileName, varID, graphicalOutputType, suffix)=self._getSelectedItemsForAnalysis()   
+        (fileNames, varIDs, graphicalOutputType, suffix)=self._getSelectedItemsForAnalysis()   
+        # For animation there can only be one filename and varID
+        fileName=fileNames[0]
+        varID=varIDs[0]
         
         if graphicalOutputType!="Animation":
-            raise "Matched animation output type from axes without it being selected!"
+            raise GSOptionHandlingError, "Matched animation output type from axes without it being selected!"
         
         cdmsfile=cdms.open(fileName)
@@ -239 +264 @@
         options=[]
         optionStrings=[]
-
+        
         # Get selections for stuff needed here
-        (fileName, varID, graphicalOutputType, suffix)=self._getSelectedItemsForAnalysis()
+        (fileNames, varIDs, graphicalOutputType, suffix)=self._getSelectedItemsForAnalysis()
         
         if graphicalOutputType=="Animation":
@@ -252 +277 @@
             animationAxes=None
         
-                
-        analyser=VariableAnalyser(fileName, varID, graphicalOutputType, animationAxes)
-        plotDict=analyser.plotConfigurationDict
+        # Get the variable (and domain) dictionary from the session object
+        varDict=self.bag["varDict"]             
+        
+        """for count in range(len(fileNames)):
+            fileName=fileNames[count]
+            varID=varIDs[count]
+            domainDict=varDict[ """
+        
+        nvars=len(fileNames)
+        
+        if nvars>1:
+            cbm=CombinedPlotManager(varDict, required="plotConfigurationDict",                          graphicalOutputType=graphicalOutputType)
+            plotDict=cbm.plotConfigurationDict
+        else:
+            #analyser=VariableAnalyser(fileNames[0], varIDs[0], graphicalOutputType, animationAxes)
+            varID=varIDs[0]
+            analyser=VariableAnalyser(graphicalOutputType=graphicalOutputType,                           domainDict=varDict[suffix]["domain"], animationAxes=animationAxes)
+            plotDict=analyser.plotConfigurationDict
         
         # Sort keys in useful order
@@ -264 +304 @@
         
         for key in okeys:
-            optionCategories.append(key+suffix)
+            optionCategories.append("%s_%s" % (key, suffix))
             optsSubList=[]
             optsStringsSubList=[]
@@ -275 +315 @@
             optionStrings.append(optsStringsSubList[:])     
 
+            """optCategories.append(["jljljljlj","OIIIIIIIIIIII"])
+            options.append(["jljljljlj","OIIIIIIIIIIII"])
+            optionStrings.append(["jljljljlj","OIIIIIIIIIIII"])  """  
         return [[optionCategories], [options], [optionStrings]]
-        """
-        return [[["plotType_2.1", "fileFormat_2.1", "projection_2.1", "continentsSwitch_2.1", "imageSize_2.1"]],
-      [[["boxfill", "isofill"],["gif", "postscript"],["standard","mollweide"],["UNAVAILABLE"],["800x600","400x300"]]],
-      [[["Boxfill", "Isofill (filled contours)"], ["GIF", "Postscript"],["Standard", "Mollweide"],["UNAVAILABLE"],
-      ["800 x 600","400 x 300"]]], ["securityo"]]"""
 
 
@@ -292 +330 @@
         fileURIs.sort()
 
-        gpattern=re.compile(r"(PointValueAndMetadata|YvsXGraph|2DPlot|Animation)_(\d+)\.?(\d+)?-?(\d+)?\.?(\d+)?")
+        gpattern=re.compile(r"(%s)_(\d+)\.?(\d+)?-?(\d+)?\.?(\d+)?" % GRAPHICAL_OUTPUT_TYPES_OR_STRING)
+        
+        suffix=self.bag["graphicalOutputType"].split("_")[-1]
         
         match=gpattern.match(self.bag["graphicalOutputType"])
@@ -300 +340 @@
         (graphicalOutputType, fileIndex1, varIndex1, fileIndex2, varIndex2)=match.groups()
 
-        if fileIndex2: 
-            raise GSOptionHandlingError, "Cannot yet handle multiple feature graphical outputs, sorry!"
-        
+        fileIndices=[fileIndex1, fileIndex2]
+        varIndices=[varIndex1, varIndex2]
+        
+        #if fileIndex2: 
+        #    raise GSOptionHandlingError, "Cannot yet handle multiple feature graphical outputs, sorry!"
+        
+        fileNames=[]
+        varIDs=[]
+        
+        for i in range(len(fileIndices)):
+            if fileIndices[i]==None: break
+            findex=int(fileIndices[i])
+            fileName=fileURIs[findex-1]
+            varIndex=int(varIndices[i])
+            varID=self.bag["fileVariable_%s.%s" % (findex, varIndex)]
+            fileNames.append(fileName)
+            varIDs.append(varID)
+            
+        """    
         fileIndex1=int(fileIndex1)
         fileName=fileURIs[fileIndex1-1]
@@ -308 +364 @@
         varID=self.bag["fileVariable_%s.%s" % (fileIndex1, varIndex1)]
 
-        suffix="_%s.%s" % (fileIndex1, varIndex1)
-
-        return (fileName, varID, graphicalOutputType, suffix)
-                  
+        suffix="_%s.%s" % (fileIndex1, varIndex1)"""
+
+        return (fileNames, varIDs, graphicalOutputType, suffix)
+
+    
             
 if __name__=="__main__":
@@ -318 +375 @@
                     "graphicalOutputType":"Animation_1.2"})
     print a.options
-
+    
+    print "HERE -1:"
+    b=OptionHandler("jane", ["dset1", "dset2"], {"sessionID":"324242",
+                    "fileURIList":["/data/var1.nc","/data/var2.nc"], 
+                    "fileVariable_1.1":"pqn",
+                    "fileVariabel_2.1":"var2"})
+    print b.options    
+  
+  
+    print "HERE:"
     o=OptionHandler("jane", ["dset1", "dset2"], {"sessionID":"324242",
                        "fileURIList":["/data/var1.nc"], "fileVariable_1.2":"pqn",
-                       "graphicalOutputType":"2DPlot_1.2"})
+                       "graphicalOutputType":"2DPlot_1.2",
+                       "varDict":{"1.2":{"name":"pqn",
+                                "domain":{"ordered_axes":["time","latitude","longitude"],
+                                        "time":["time","time",[0,4]],
+                                        "latitude":["latitude","latitude",[0,90]],
+                                        "longitude":["longitude","longitude",[0,359]],
+                                        "grots":["2DLatLonPlot"]}}}})
     print o.options
-
+    
+    print "HERE 1:"
+    
+    o=OptionHandler("jane", ["dset1", "dset2"], {"sessionID":"324242",                          "fileURIList":["/data/var1.nc", "/data/var2.nc"], "fileVariable_1.1":"pqn",             "fileVariable_2.1":"var2",
+        "graphicalOutputType":"MultipleTrajectoriesOver2DLatLonPlot_1.1-2.1",
+                       "varDict":{"1.1":{"name":"pqn",
+                                "domain":{"ordered_axes":["time","latitude","longitude"],
+                                        "time":["time","time",[0,4]],
+                                        "latitude":["latitude","latitude",[0,90]],
+                                        "longitude":["longitude","longitude",[0,359]],
+                                        "grots":["2DLatLonPlot"]}},
+                                "2.1":{"name":"var2",
+                                "domain":{"ordered_axes":["time","latitude","longitude"],
+                                        "time":["time","time",[0,4]],
+                                        "latitude":["latitude","latitude",[0,90]],
+                                        "longitude":["longitude","longitude",[0,359]],
+                                        "grots":["2DLatLonPlot"]}}}})
+    print o.options    
+    
+    print "HERE 2:"
+    o=OptionHandler("jane", ["dset1", "dset2"], {"sessionID":"324242",
+                       "fileURIList":["/data/var1.nc", "/data/var2.nc"], "fileVariable_1.1":"pqn",
+                       "fileVariable_2.1":"var2"})
+    """                "graphicalOutputType":"MultipleTrajectoriesOver2DLatLonPlot_1.1-2.1",
+                       "varDict":{"1.1":{"name":"pqn",
+                                "domain":{"ordered_axes":["time","latitude","longitude"],
+                                        "time":["time","time",[0,4]],
+                                        "latitude":["latitude","latitude",[0,90]],
+                                        "longitude":["longitude","longitude",[0,359]],
+                                        "grots":["2DLatLonPlot"]}},
+                                "2.1":{"name":"var2",
+                                "domain":{"ordered_axes":["time","latitude","longitude"],
+                                        "time":["time","time",[0,4]],
+                                        "latitude":["latitude","latitude",[0,90]],
+                                        "longitude":["longitude","longitude",[0,359]],
+                                        "grots":["2DLatLonPlot"]}}}})"""
+    print o.options    
+    sys.exit()
     p=OptionHandler("jane", ["dset1", "dset2"], {'continentsSwitch':'on', 'status': 'constructing', 'username': 'jane', 'accessTime': 1142324428.122052, 'projection': 'standard', 'fileVariable_1.2': 'pqn', 'fileURIList': ['/data/var1.nc'], 'userRoles': [], 'sessionID': 'session_20060314082027136', 'plotType': 'boxfill', 'fileFormat': 'GIF', 'getOutput': 'getOutput', 'imageSize': '800x600'})
     print p.options

TI04-geosplat/trunk/pygss/OutputManager.py

@@ -55 +55 @@
         fileURIs.sort()
 
-        gpattern=re.compile(r"(PointValueAndMetadata|YvsXGraph|2DPlot|Animation)_(\d+)\.?(\d+)?-?(\d+)?\.?(\d+)?")
+        gpattern=re.compile(r"(%s)_(\d+)\.?(\d+)?-?(\d+)?\.?(\d+)?" % GRAPHICAL_OUTPUT_TYPES_OR_STRING)
         
         match=gpattern.match(self.bag["graphicalOutputType"])
@@ -63 +63 @@
         (self.graphicalOutputType, fileIndex1, varIndex1, fileIndex2, varIndex2)=match.groups()
 
-        if fileIndex2: 
-            raise GSOptionHandlingError, "Cannot yet handle multiple feature graphical outputs, sorry!"
-        
-        fileIndex1=int(fileIndex1)
+        """if fileIndex2: 
+            raise GSOptionHandlingError, "Cannot yet handle multiple feature graphical outputs, sorry!"  """
+        
+        fileIndices=[fileIndex1, fileIndex2]
+        varIndices=[varIndex1, varIndex2]
+        
+        varIDs=[]
+        self.infilePaths=[]
+        self.infiles=[]
+        self.vars=[]
+        self.varCodes=[]
+        
+        for count in range(len(fileIndices)):
+            varIndex=varIndices[count]
+            if varIndex==None: continue
+            varIndex=int(varIndex)
+            fileIndex=int(fileIndices[count])
+            varID=self.bag["fileVariable_%s.%s" % (fileIndex, varIndex)]
+            
+            varIDs.append(varID)
+            infilePath=fileURIs[fileIndex-1]
+            self.infilePaths.append(infilePath)
+            self.infiles.append(cdms.open(infilePath))
+            self.vars.append(self.infiles[count](varID))
+                
+            # Set a flag for combined variables so you can get the varIndices
+            self.varCodes.append("%s.%s" % (fileIndex, varIndex))
+        
+        """fileIndex1=int(fileIndex1)
         varIndex1=int(varIndex1)
         varID=self.bag["fileVariable_%s.%s" % (fileIndex1, varIndex1)]
         
-        infile=cdms.open(fileURIs[fileIndex1-1])
-        self.var=infile(varID)
-        
-        self.suffix="%s.%s" % (fileIndex1, varIndex1)
+        self.infilePath=fileURIs[fileIndex1-1]
+        infile=cdms.open(self.infilePath)
+        self.infile=infile
+        self.var=self.infile(varID)
+        
+        self.suffix="%s.%s" % (fileIndex1, varIndex1)"""
         
         if self.graphicalOutputType=="PointValueAndMetadata":
-            self.textOnly=self._createTextOutputString(infile) 
-
-        infile.close()
-
-    def _createTextOutputString(self, cdmsFile):
+            self.textOnly=self._createTextOutputString(self.infilePaths[0], varIDs[0]) 
+
+        # Close infiles for tidiness
+        for infile in self.infiles:
+            infile.close()
+
+
+    def _createTextOutputString(self, fname, varID):
         """
         Returns a text string including the variable value and suitable 
         metadata.
         """
+        cdmsFile=cdms.open(fname)
+        var=cdmsFile(varID)
+        
         axisinfo="<B>Axis Information:</B>"
-        for ax in self.var.getAxisList():
+        for ax in var.getAxisList():
             axisinfo="""%s
 
@@ -108 +141 @@
 <B>Variable units:</B> %s
 
-%s""" % (getBestName(self.var), self.var.flat[0], getattr(self.var, "units", "-"), axisinfo)    
+%s""" % (getBestName(var), var.flat[0], getattr(var, "units", "-"), axisinfo)   
         
         print textOutput
@@ -140 +173 @@
             "robinson":"Robinson"}          
         
-        if plotType in ["YvsXGraph"]:
+        # set bounding box off unless overridden below
+        self.bbox=None
+        
+        if plotType in ["YvsXGraph", "MultipleTrajectory"]:
             self.plotClass=plotType   
         elif plotType=="isolineAndFill":
             self.plotClass="IsolineAndFill"+projMap[projection] 
+        elif plotType=="MultipleTrajectoryOverBoxfillLinear":
+            self.plotClass="MultipleTrajectoryOVERBoxfillLinear"
+            continentsSwitch="on"
+            varCodeString="-".join(self.varCodes)
+            
+            if self.bag["mapArea"]=="surroundingArea":
+                self.bbox=self.bag["varDict"][varCodeString]["domain"]["bbox"]
+            elif self.bag["mapArea"]=="global":
+                # bbox lat/lon needed even if global to ensure start 
+                # longitude is same for both layers
+                bbox=self.bag["varDict"][varCodeString]["domain"]["bbox"]
+                (lat0, lon0, lat1, lon1)=bbox
+                self.bbox=(-90, lon0, 90, lon1)
         else:
             self.plotClass=plotType.title()+projMap[projection] 
@@ -190 +239 @@
                 proj=self.plotClass[14:]
                 plotClassList=["Isofill"+proj, "Isoline"+proj]      
+                # Need to patch up here to ensure that correct file and var are used
+                self.vars.append(self.vars[0])
+                self.infilePaths.append(self.infilePaths[0])
+            elif self.plotClass.find("OVER")>-1:
+                plotClassList=self.plotClass.split("OVER")
+                # Reverse lists because 'OVER' means display last
+                plotClassList.reverse()
+                self.vars.reverse()
+                self.infilePaths.reverse()
             else:
-                plotClassList=[self.plotClass]  
-        
-            # Loop through (note only relevant really for isoline and fill
-            for plotClass in plotClassList:
-                plotter=eval("%s(vcsCanvas, self.var(squeeze=1))" % plotClass)
+                plotClassList=[self.plotClass]
+        
+            # Loop through for overlays
+            for count in range(len(plotClassList)):
+                thisPlotClass=plotClassList[count]
+                print thisPlotClass
+                infilePath=self.infilePaths[count]
+                var=self.vars[count]
+                
+                if thisPlotClass.find("MultipleTrajectory")>-1:
+                    area=self.bag.get("mapArea", None)
+                    # Need special case for trajectories where whole file is sent
+                    print "\n%s(vcsCanvas, infilePath, var.id, area, bbox=self.bbox)" % thisPlotClass
+                    plotter=eval("%s(vcsCanvas, infilePath, var.id, area, bbox=self.bbox)" % thisPlotClass)
+                else:
+                    print "\n%s(vcsCanvas, var(squeeze=1), bbox=self.bbox)" % thisPlotClass
+                    plotter=eval("%s(vcsCanvas, var(squeeze=1), bbox=self.bbox)" % thisPlotClass)
                 
-                if plotClass in ["YvsXGraph"]:
+                if thisPlotClass in ["YvsXGraph", "MultipleTrajectory"]:
                     plotter.createPlot()
                 else:
                     plotter.createPlot(continentsSwitch=self.contSwitch)
-
+                
             # Plot appropriate output format 
             if self.fileFormat=="gif": 
@@ -219 +289 @@
         If animation is selected then control it here.
         """
-
+        self.var=self.vars[0]
         plotter=eval("%s(vcsCanvas, self.var)" % self.plotClass)        
                 
@@ -348 +418 @@
         return (valueList, colourList)
 
- 
-        
-                                
                         
 if __name__=="__main__":
-
+    print "Trying to plot trajectory over model field...\n"
+    b=OutputManager({'status': 'complete', 'username': 'undefined', 'outputURLPath': 'http://localhost/gs/output/output_20061101192149.gif', 'graphicalOutputType': 'MultipleTrajectoriesOver2DLatLonPlot_2.2-3.1', 'projection': 'standard', 'proceed': 'Proceed', 'fileURIList': ['/data/trajbadc.nc', '/data/trajcf.nc', '/data/var2.nc'], 'userRoles': [], 'varDict': {'2.2': {'domain': {'grots': [['TrajectoriesOverMap', "Trajectories plotted on map for variable 'o3' from file: '/data/trajcf.nc'"], ['YvsXGraph', "Y-vs-X Graph for variable 'o3' from file: '/data/trajcf.nc'"]], 'time': ['time', 'time', [1.0, 432000.0]], 'ordered_axes': ['time'], 'bbox': (42.299999237060547, 22.5, 67.399986267089844, 126.36080169677734)}, 'id': 'o3'}, '2.2-3.1': {'domain': {'grots': [['MultipleTrajectoriesOver2DLatLonPlot', "Multiple Trajectories for variable 'o3' plotted over 2D Plot for variable 'var2' (files: /data/trajcf.nc, /data/var2.nc)"]], 'bbox': (40.299999237060547, 0, 69.399986267089844, 355)}}, '3.1': {'domain': {'latitude': ['latitude', 'latitude', [-90, 90]], 'grots': [['2DLatLonPlot', "2D Lat-Lon Plot for variable 'var2' from file: '/data/var2.nc'"]], 'ordered_axes': ['time', 'latitude', 'longitude'], 'longitude': ['longitude', 'longitude', [0, 355]], 'time': ['time', 'time', [0, 0]]}, 'id': 'var2'}}, 'fileVariable_2.2': 'o3', 'sessionID': 'session_20061101192119146', 'plotType': 'MultipleTrajectoryOverBoxfillLinear', 'mapArea': 'global', 'fileVariable_3.1': 'var2', 'outputFilePath': '/home/as56/apache/htdocs/gs/output/output_20061101192149.gif', 'fileFormat': 'gif', 'accessTime': 1162408909.777725, 'imageSize': '800x600'})
+    b.createOutputs()
+    sys.exit()    
+    
+    b=OutputManager({'status': 'constructing', 'username': 'undefined', 'imageSize': '800x600', 'graphicalOutputType': 'MultipleTrajectoriesOver2DLatLonPlot_1.5-2.1', 'proceed': 'Proceed', 'fileVariable_1.5': 'temp', 'fileURIList': ['/data/traj.nc', '/data/var2.nc'], 'userRoles': [], 'varDict': {'1.5': {'domain': {'grots': [['TrajectoriesOverMap', "Trajectories plotted on map for variable 'temp' from file: '/data/traj.nc'"], ['2DPlot', "2D Plot for variable 'temp' from file: '/data/traj.nc'"]], 'parcel': ['parcel', 'unrecognised', [0.0, 1.0]], 'bbox': (42.299999237060547, 22.500001907348633, 67.399993896484375, 126.36080169677734), 'ordered_axes': ['time', 'parcel'], 'time': ['time', 'time', [0.0, 432000.0]]}, 'id': 'temp'}, '2.1': {'domain': {'latitude': ['latitude', 'latitude', [-90, 90]], 'grots': [['2DLatLonPlot', "2D Lat-Lon Plot for variable 'var2' from file: '/data/var2.nc'"]], 'ordered_axes': ['time', 'latitude', 'longitude'], 'longitude': ['longitude', 'longitude', [0, 355]], 'time': ['time', 'time', [0, 0]]}, 'id': 'var2'}, '1.5-2.1': {'domain': {'grots': [['MultipleTrajectoriesOver2DLatLonPlot', "Multiple Trajectories for variable 'temp' plotted over 2D Plot for variable 'var2'"]], 'bbox': (42.299999237060547, 0, 67.399993896484375, 355)}}}, 'sessionID': 'session_20061101181119418', 'fileVariable_2.1': 'var2', 'plotType': 'MultipleTrajectoryOverBoxfillLinear', 'mapArea': 'global', 'fileFormat': 'gif', 'accessTime': 1162404696.146235, 'projection': 'standard'}
+)
+    b.createOutputs()
+    sys.exit()
+    
+    b=OutputManager({'mapArea':"global", 'outputURLPath': 'http://localhost/gs/output/output_20061004002742.gif', 'graphicalOutputType': 'TrajectoriesOverMap_1.1', 'projection': 'standard', 'getOutput':"getOutput", 'fileURIList': ['/data/traj.nc'], 'fileVariable_1.1': 'lat', 'sessionID': 'session_20061004002735159', 'plotType': 'MultipleTrajectory', 'outputFilePath': '/home/as56/apache/htdocs/gs/output/output_20061004002742.gif', 'fileFormat': 'gif', 'imageSize': '800x600'})
+    b.createOutputs()
     b=OutputManager({'fileVariable_1.1':'t', 'status': 'constructing', 'username': 'jane', 'accessTime': 1142557842.2275701, 'fileURIList': ['/data/dx/0d.nc'], 'userRoles': [], 'sessionID': 'session_20060317011041792', 'graphicalOutputType': 'PointValueAndMetadata_1.1', 'getOutput': 'getOutput'})
-    sys.exit()
-    b=OutputManager({'status': 'constructing', 'username': None, 'outputURLPath': 'http://localhost/output/test.gif', 'fileURIList': ['/srv/www/htdocs/output/jane/dx_output/output_20060316232539.nc'], 'imageSize': '300x200', 'confirm': 'Confirm', 'accessTime': 1142551623.3794341, 'userRoles': [], 'sessionID': 'session_20060316232622350', 'graphicalOutputType': 'YvsXGraph_1.1', 'plotType': 'YvsXGraph', 'proceed': 'Proceed', 'action': 'createOutput', 'outputFilePath': '/srv/www/htdocs/output/test.gif', 'fileFormat': 'postscript', 'getOutput': 'getOutput', 'fileVariable_1.1': 'var1'})
+
+    b=OutputManager({'status': 'constructing', 'username': None, 'outputURLPath': 'http://localhost/output/test.gif', 'fileURIList': ['/data/var2.nc'], 'imageSize': '300x200', 'confirm': 'Confirm', 'accessTime': 1142551623.3794341, 'userRoles': [], 'sessionID': 'session_20060316232622350', 'graphicalOutputType': '2DLatLonPlot_1.1', 'plotType': 'boxfill', 'proceed': 'Proceed', 'action': 'createOutput', 'outputFilePath': '/srv/www/htdocs/output/test.gif', 'fileFormat': 'postscript', 'getOutput': 'getOutput', 'fileVariable_1.1': 'var2'})
     b.createOutputs()
     sys.exit()

TI04-geosplat/trunk/pygss/PlotClasses.py

@@ -12 +12 @@
 
 # Import standard libary modules
-
+import cdms, vcs
 
 # Import local modules
 from serverConfig import *
+from common import *
+
 
 class YvsXGraph:
@@ -108 +110 @@
             #print dataSlice.shape, dataSlice.getAxisIds()
             #print dataSlice
-            self.canvas.plot(dataSlice, self.template, self.plot_type, continents=continentsSwitch, bg=1, file_comment=fileComment, comment1=SOURCE_NAME) 
-
-
-#        elif animationArgs[0]=="time":
-#            self.canvas.plot(self.data(time=slice(animationArgs[1][0],animationArgs[1][1])), self.template, bg=1, continents=continentsSwitch, file_comment=fileComment, comment1=SOURCE_NAME) 
-#        elif animationArgs[0]=="level":
-#            self.canvas.plot(self.data(level=slice(animationArgs[1][0],animationArgs[1][1])), self.template, bg=1, continents=continentsSwitch, file_comment=fileComment, comment1=SOURCE_NAME)                
+            self.canvas.plot(dataSlice, self.template, self.plot_type, continents=continentsSwitch, bg=1, file_comment=fileComment, comment1=SOURCE_NAME)       
 
 
@@ -122 +118 @@
     """
     
-    def __init__(self, canvas, data):
+    def __init__(self, canvas, data, bbox=None):
         self.canvas=canvas
+        self.bbox=bbox
         try:
             self.plot_type=canvas.createboxfill("new_boxfill","default")
@@ -149 +146 @@
         except:
             self.template=self.canvas.gettemplate("AMIP")
+        if self.bbox:  # set up lat/lon limits
+            #d=self.template.data
+            #(d.y1,d.x1,d.y2,d.x2)=self.bbox
+            
+            pt=self.plot_type
+            pt.datawc_x1=self.bbox[1]
+            pt.datawc_x2=self.bbox[3]
+            pt.datawc_y1=self.bbox[0]
+            pt.datawc_y2=self.bbox[2]
+
 
     def createPlot(self, animationArgs=None, continentsSwitch=1):
@@ -155 +162 @@
         """
         # The next line is a bug fix to stop part of the plot being chopped when background plot is set to 1 (on).
-        # self.canvas.open()
+        # self.canvas.open())
         if hasattr(self.data, "title"):
             fileComment="Dataset: "+self.data.title
@@ -169 +176 @@
             self.canvas.plot(dataSlice, self.template, self.plot_type, continents=continentsSwitch, bg=1, file_comment=fileComment, comment1=SOURCE_NAME) 
 
+
         #elif animationArgs[0]=="time":
         #    self.canvas.plot(self.data(time=slice(animationArgs[1][0],animationArgs[1][1])), self.template, self.plot_type, continents=continentsSwitch, bg=1, file_comment=fileComment, comment1=SOURCE_NAME) 
@@ -289 +297 @@
         
         
-        
+class MultipleTrajectory:
+    """
+    Plots multiple trajectories on the selected domain.
+    """ 
+    def __init__(self, canvas, filePath, varID, area, bbox=None):
+        """
+        Takes canvas and file and varID and calls other relevant methods.
+        """
+        self.canvas=canvas
+        self.area=area
+        self.bbox=bbox
+        self.filePath=filePath
+        self.cdmsFile=cdms.open(filePath)
+        self.varID=varID
+        self._extractData()
+        self.titleTemplate=self._getTemplate("titlet")
+        self.tboxTemplate=self._getTemplate("tboxt")
+        
+    def _extractData(self):
+        """
+        Used to extract the appropriate data object.
+        Returns a dictionary of {"parcelID":[[y,x],[y,x]...]]}
+        """
+        f=self.cdmsFile
+        self.data={}
+        
+        # Get var ids of lat and lon in file
+        [latID, lonID]=identifyLatLonVarIDs(f)
+        if latID==None or lonID==None:
+            raise GSPlottingError, "Could not identify and latitude and longitude variable to plot trajectory."
+        
+        # Now sort what needs plotting
+        lat=f[latID]
+        if lat.rank()==1:
+            lats=f(latID)[:].tolist()
+            lons=f(lonID)[:].tolist()
+            data=[[lats[i],lons[i]] for i in range(len(lats))]
+            self.data["single_traj"]=data[:]
+        else: # assume there is a parcel dimension as well
+            for parcel in range(len(lat[1])):
+                lats=f(latID)[:,parcel].tolist()
+                lons=f(lonID)[:,parcel].tolist()
+                data=[[lats[i],lons[i]] for i in range(len(lats))]
+                self.data[parcel]=data[:]
+            
+        if hasattr(f[self.varID], "title"):
+            self.title=f[self.varID].title
+        return self.data
+
+    def _getTemplate(self, name):
+        """
+        Sets up the appropriate template for a plot type.
+        """
+        try:
+            t=self.canvas.createtemplate(name, VCS_TEMPLATES["no_levels"])      
+        except:
+            try: 
+                t=self.canvas.createtemplate(name, "AMIP")      
+            except:
+                t=self.canvas.gettemplate(name)    
+        """try:
+            t=self.canvas.createtemplate(name, VCS_TEMPLATES["no_levels"])
+        except:
+            t=self.canvas.gettemplate(name)"""
+        
+        """box=t.box1
+        box.x1 = 0.0500000007451
+        box.y1 = 0.259999990463
+        box.x2 = 0.949999988079
+        box.y2 = 0.860000014305"""
+        data=t.data
+        #data.x1 = 0.0500000007451
+        #data.y1 = 0.263999560899
+        #data.x2 = 0.949999988079
+        #data.y2 = 0.856999927733       
+        #print t.name,"\n\n\n"
+        if name=="titlet":
+                t.max.priority=0
+                t.min.priority=0
+                t.mean.priority=0
+                t.crdate.priority=0
+                t.units.priority=0
+                t.crtime.priority=0
+                t.dataname.priority=0   
+                t.legend.priority=0
+                t.comment1.priority=1
+
+                try:
+                    title=self.canvas.createtexttable("title_stuff")
+                except:
+                    title=self.canvas.gettexttable("title_stuff")                       
+                title.font=1
+                t.title.texttable=title
+                try:
+                    titleto=self.canvas.createtextorientation("title_textorient")
+                except:
+                    titleto=self.canvas.gettextorientation("title_textorient")                  
+                titleto.height=30
+                print t.title.list()
+                t.title.x=0.13
+                t.title.y=0.99
+                t.title.textorientation=titleto 
+        return t        
+
+    def _prepareContinents(self, bbox):
+        """
+        Prepares continents for plot.
+        """
+        try:
+            c=self.canvas.createcontinents("c1")
+        except:
+            c=self.canvas.getcontinents("c1")   
+
+        c.datawc_x1=bbox[1]
+        c.datawc_x2=bbox[3]
+        c.datawc_y1=bbox[0]
+        c.datawc_y2=bbox[2]
+        c.xticlabels1="*"
+        c.xticlabels2="*"
+        c.yticlabels1="*"
+        c.yticlabels2="*"                       
+        return c        
+
+    def _convertWC(self, i, xory, bbox, tbox):
+        """
+        Converts World Coordinates to pixel coordinates.
+        """
+        [y1,x1,y2,x2]=bbox  
+        [boty,botx,topy,topx]=tbox
+        if xory=="x":
+                return ((i-x1)/(x2-x1)*(topx-botx))+botx
+        elif xory=="y":
+                return ((i-y1)/(y2-y1)*(topy-boty))+boty
+
+    def _getExtent(self, datadict):
+        """
+        Returns the full extent of all trajectories.
+        """
+        maxLat=-91; 
+        maxLon=-361
+        minLat=91
+        minLon=361      
+        for key,data in datadict.items():
+            for (y,x) in data:
+                if y>maxLat:    maxLat=y
+                if y<minLat:    minLat=y
+                if x>maxLon:    maxLon=x
+                if x<minLon:    minLon=x
+        return (minLat,minLon,maxLat,maxLon)
+
+    def createPlot(self):
+        """
+        Plots the output and saves to a file.
+        """
+        if hasattr(self, "title"):
+            fileComment="Dataset: "+self.title
+        else:
+            fileComment=""
+        
+        datadict=self.data
+        if self.bbox:
+            bbox=self.bbox
+        else:
+            bbox=self._getExtent(datadict)
+            (y1,x1,y2,x2)=bbox
+
+            domain=self.area
+            if domain=="global":
+                bbox=[-90,(x1-20),90,(x1+340)]
+            elif domain=="northernHemisphere":
+                bbox=[0,(x1-20),90,(x1+340)]
+            elif domain=="southernHemisphere":
+                bbox=[-90,(x1-20),0,(x1+340)]
+            else:
+                bbox=[(y1-5),(x1-5),(y2+5),(x2+5)]
+        
+        c=self._prepareContinents(bbox)
+        t=self.tboxTemplate
+        d=t.data
+        tbox=(d.y1,d.x1,d.y2,d.x2)    
+       
+        self.canvas.plot(c, t, bg=1)
+        
+        parcels=datadict.keys()
+        parcels.sort()
+    
+        colourRange=range(30,180,10)*50
+        count=0
+        
+        for p in parcels:
+                data=datadict[p]
+                col=colourRange[count]  
+                try:
+                    marker=self.canvas.createmarker("markertest%s"%count)
+                except:
+                    marker=self.canvas.getmarker("markertest%s"%count)                  
+                marker.y=[self._convertWC(data[0][0],"y",bbox,tbox)]
+                marker.x=[self._convertWC(data[0][1],"x",bbox,tbox)]
+                marker.size=[4.0]
+                marker.type=["circle"]
+                marker.color=[col]
+                self.canvas.plot(marker,t,bg=1)
+        
+                try:
+                    line=self.canvas.createline("trajline%s"%count)
+                except:
+                    line=self.canvas.getline("trajline%s"%count)        
+                                
+                line.y=[self._convertWC(i[0],"y",bbox,tbox) for i in data]
+                line.x=[self._convertWC(i[1],"x",bbox,tbox) for i in data]
+                line.color=[col]
+                count+=1
+                self.canvas.plot(line, t, bg=1)
+    
+        # Now plot a title
+        self.canvas.plot([0,0], self.titleTemplate, bg=1, title="Plot of trajectory data from file: %s" % self.filePath)#, bg=1, file_comment=fileComment, comment1=SOURCE_NAME)
+
+
+
+if __name__=="__main__":
+    import vcs, cdms
+    vcsCanvas=vcs.init()
+    infile="/data/traj.nc"
+    varid="temp"
+    plotClass="MultipleTrajectory"
+    plotter=eval("%s(vcsCanvas, infile, varid, 'global')" % plotClass)
+    print "done"
+    plotter.createPlot()
+    

TI04-geosplat/trunk/pygss/VariableAnalyser.py

@@ -26 +26 @@
 
 # Import external modules
-import cdms
+import cdms, genutil
 
 class VariableAnalyser:
@@ -33 +33 @@
     """
     
-    def __init__(self, filename, varID, graphicalOutputType=None, animationAxes=None):
+    def __init__(self, filename=None, varID=None, graphicalOutputType=None, animationAxes=None, domainDict=None):
         """
         Takes a variable and analyses it to return a known Feature type.
@@ -40 +40 @@
         self.filename=filename
         self.varID=varID
-        cdmsfile=cdms.open(self.filename)
-        self.var=cdmsfile[varID]
-        self._analyse(graphicalOutputType, animationAxes)
-        cdmsfile.close()
+        self.domainDict=domainDict
+        
+        if (self.filename==None and self.varID==None) and self.domainDict==None:
+            raise GSOptionHandlingError, "VariableAnalyser needs either filename/varID or domainDict as valid arguments."
+        
+        if self.domainDict:
+            # Call the code to get 
+            self._analyse(graphicalOutputType, animationAxes)
+        else:
+            cdmsfile=cdms.open(self.filename)
+            self.var=cdmsfile[varID]
+            self._analyse(graphicalOutputType, animationAxes)
+            cdmsfile.close()
 
 
@@ -51 +60 @@
         """
         if graphicalOutputType==None:
-            ft=self._getFeatureType()
-            self.plotOpts=self._getGraphicalOutputTypes(ft)
-        else:
-            print graphicalOutputType*10
+            fts=self._getFeatureTypes()
+            if type(fts)==type("string"): fts=[fts]
+            self.plotOpts=[]
+            for ft in fts:
+                self.plotOpts.append(self._getGraphicalOutputTypes(ft)[0])
+            # Add graphical output types to domainDict
+            self.domainDict["grots"]=self.plotOpts
+        else:
             self.plotConfigurationDict=self._getPlotConfigurationDetails(graphicalOutputType, animationAxes)
         
         
-    def _getFeatureType(self):
+    def _getFeatureTypes(self):
         """ 
         Return Feature Type if can be identified, otherwise returns None.
         """
-
         axes=self.var.getAxisList()
+        
+        # Save axes to self.domainDict for use on next call
+        self.domainDict={}
+        orderedList=[]
+        for axis in axes:
+            id=axis.id
+            if axis.isTime(): 
+                known="time"
+            elif axis.isLevel():
+                known="level"
+            elif axis.isLatitude():
+                known="latitude"
+            elif axis.isLongitude():
+                known="longitude"
+            else:
+                known="unrecognised"
+            (low, high)=(axis[0], axis[-1])
+            self.domainDict[id]=[id, known, [low,high]]
+            orderedList.append(id)
+            
+        self.domainDict["ordered_axes"]=orderedList
+        
         shape=self.var.shape
         size=self.var.size()
@@ -76 +110 @@
             
         ndims=len(usefulAxes)
+        
         if ndims==1:
-            return "ProfileFeature"
+            trajCheck=self._checkForTrajectoryFeature()
+            if trajCheck:
+                self.domainDict["bbox"]=trajCheck # which is (y1,x1,y2,x2)
+                return ["TrajectoryFeature", "ProfileFeature"]
+            else:
+                return "ProfileFeature"         
         elif ndims==2:
-            return "2DGridFeature"
+            trajCheck=self._checkForTrajectoryFeature()
+            if trajCheck:
+                self.domainDict["bbox"]=trajCheck # which is (y1,x1,y2,x2)
+                return ["TrajectoryFeature", "2DGridFeature"]
+            else:
+                if self._testLatLon(axes):
+                    return "2DLatLonGridFeature"
+                else:
+                    return "2DGridFeature"
         elif ndims>2:
             return "%sDGridFeature" % ndims
-           
+        else:
+            raise  GSSelectionError, "Could not identify any useful data in this file."
+        
         
     def _getGraphicalOutputTypes(self, featureType):
@@ -92 +142 @@
         
         if ft=="PointFeature":
-            return [["PointValueAndMetadata", "Display single value for variable '%s' from file: '%s'" % (self.varID, self.filename)]]
+            return [["PointValuetrueAndMetadata", "Display single value for variable '%s' from file: '%s'" % (self.varID, self.filename)]]
             
         elif ft=="ProfileFeature":
@@ -99 +149 @@
         elif ft=="2DGridFeature":
             return [["2DPlot", "2D Plot for variable '%s' from file: '%s'" % (self.varID, self.filename)]]
+        
+        elif ft=="2DLatLonGridFeature":
+            return [["2DLatLonPlot", "2D Lat-Lon Plot for variable '%s' from file: '%s'" % (self.varID, self.filename)]]        
+        
+        elif ft=="TrajectoryFeature":
+            return [["TrajectoriesOverMap", "Trajectories plotted on map for variable '%s' from file: '%s'" % (self.varID, self.filename)]]
 
         else:
@@ -117 +173 @@
             
             
-        elif grot in ("2DPlot", "Animation"):
-        
+        elif grot in ("2DPlot", "2DLatLonPlot", "Animation"):
+        
+            # Note that domainDict should hold axes as:
+            # id:[id, known_as, [low,high]]
             if animationAxes!=None:
             
@@ -125 +183 @@
             
                 for axID in (loopID, yID, xID):
-                    axis=self.var.getAxis(self.var.getAxisIds().index(axID))
+                    axis=self.domainDict[axID]
                     axisList.append(axis)           
             
             else:
                 axisList=[]
-                for axis in self.var.getAxisList():
-                    if len(axis)>1:
+                print self.domainDict
+                orderedList=[self.domainDict[axisID] for axisID in self.domainDict["ordered_axes"]]
+                for axis in orderedList:
+                    if len(axis[2])>1:
                         axisList.append(axis)
         
-            latLonAxesTest=self._testLatLon(axisList[-2:])
-
-            if latLonAxesTest:
+            if grot in ("2DLatLonPlot",): 
+              latLonAxesTest=self._testLatLon(axisList[-2:])
+              if latLonAxesTest:
                 plotConfigDict["continentsSwitch"]=[["on", "Show continents"], ["off", "Do not show continents"]]
                 
@@ -153 +213 @@
                 plotConfigDict["projection"]=projections
         
-            if grot=="2DPlot":
+            if grot in ("2DPlot", "2DLatLonPlot"):
                 plotTypes=[["boxfill", "Boxfill"],["isofill", "Isofill"],
                        ["isoline", "Isoline"],["isolineAndFill", "Isoline and Isofill"]]
@@ -162 +222 @@
             plotConfigDict["plotType"]=plotTypes
             
-                        
+        elif grot in ("TrajectoriesOverMap",):
+            plotConfigDict["plotType"]=[["MultipleTrajectory", "Multiple Trajectory Plot"]]     
+            plotConfigDict["projection"]=[["standard", "Standard"]]             
+            plotConfigDict["mapArea"]=[["surroundingArea","Surrounding Area"],["global","Global"]]      
+                
+        elif grot in ("MultipleTrajectoriesOver2DLatLonPlot",):
+            plotConfigDict["plotType"]=[["MultipleTrajectoryOverBoxfillLinear", "Multiple Trajectory Plot over Boxfill Lat-Lon Plot"]]  
+            plotConfigDict["projection"]=[["standard", "Standard"]]             
+            plotConfigDict["mapArea"]=[["surroundingArea","Surrounding Area"],["global","Global"]]              
+                                        
         # Start with the easy one, image sizes
         imageSizes=["800 x 600", "300 x 200", "600 x 400", "792 x 612", "1000 x 800"]
@@ -170 +239 @@
         
         # Then file format, also straightforward
+
         if grot=="Animation":
             fileFormats=["GIF"]
@@ -180 +250 @@
                 
 
+    #def _getPlotConfigurationDetailsDEPRECATED(self, graphicalOutputType, animationAxes=None):
+        """
+        Returns plot configuration details in a dictionary of options
+        where each value is a list of lists holding the short name and long name 
+        of the available options.
+        """
+        """plotConfigDict={}    
+        grot=graphicalOutputType
+        print grot
+        if grot=="YvsXGraph":
+            plotConfigDict["plotType"]=[["YvsXGraph", "Y-vs-X Graph"]]
+            
+            
+        elif grot in ("2DPlot", "2DLatLonPlot", "Animation"):
+        
+            if animationAxes!=None:
+            
+                (loopID, yID, xID)=animationAxes
+                axisList=[]
+            
+                for axID in (loopID, yID, xID):
+                    axis=self.var.getAxis(self.var.getAxisIds().index(axID))
+                    axisList.append(axis)           
+            
+            else:
+                axisList=[]
+                for axis in self.var.getAxisList():
+                    if len(axis)>1:
+                        axisList.append(axis)
+        
+            if grot in ("2DLatLonPlot",): 
+              latLonAxesTest=self._testLatLon(axisList[-2:])
+              if latLonAxesTest:
+                plotConfigDict["continentsSwitch"]=[["on", "Show continents"], ["off", "Do not show continents"]]
+                
+                [[south, north], [west, east]]=latLonAxesTest
+                
+                projections=[["standard", "Standard"]]
+                if (east-west)>200: # Need 200+ degrees west-east to use projections safely
+                    projections.append(["mollweide", "Mollweide"])
+                    projections.append(["robinson", "Robinson"])                    
+                    
+                    if north>80 and south<10:
+                        projections.append(["northPolar", "Polar (Northern Hemisphere)"])
+                    if north>-10 and south<-80:
+                        projections.append(["southPolar", "Polar (Southern Hemisphere)"])
+        
+                plotConfigDict["projection"]=projections
+        
+            if grot in ("2DPlot", "2DLatLonPlot"):
+                plotTypes=[["boxfill", "Boxfill"],["isofill", "Isofill"],
+                       ["isoline", "Isoline"],["isolineAndFill", "Isoline and Isofill"]]
+            elif grot=="Animation":
+                plotTypes=[["boxfill", "Boxfill"],["isofill", "Isofill"],
+                           ["isoline", "Isoline"]]              
+                
+            plotConfigDict["plotType"]=plotTypes
+            
+        elif grot in ("TrajectoriesOverMap",):
+            plotConfigDict["plotType"]=[["MultipleTrajectory", "Multiple Trajectory Plot"]]     
+            plotConfigDict["projection"]=[["standard", "Standard"]]             
+            plotConfigDict["mapArea"]=[["surroundingArea","Surrounding Area"],["global","Global"]]      
+                
+        elif grot in ("MultipleTrajectoriesOver2DLatLonPlot",):
+            plotConfigDict["plotType"]=[["MultipleTrajectory", "Multiple Trajectory Plot"]]     
+            plotConfigDict["projection"]=[["standard", "Standard"]]             
+            plotConfigDict["mapArea"]=[["surroundingArea","Surrounding Area"],["global","Global"]]              
+                                        
+        # Start with the easy one, image sizes
+        imageSizes=["800 x 600", "300 x 200", "600 x 400", "792 x 612", "1000 x 800"]
+        imageSizesLists=[[i.replace(" ",""), i] for i in imageSizes]
+        
+        plotConfigDict["imageSize"]=imageSizesLists
+        
+        # Then file format, also straightforward
+
+        if grot=="Animation":
+            fileFormats=["GIF"]
+        else:
+            fileFormats=["GIF", "Postscript"]
+        fileFormatsLists=[[i.lower(), i] for i in fileFormats]
+        plotConfigDict["fileFormat"]=fileFormatsLists
+
+        return plotConfigDict"""
+
+
+
     def _testLatLon(self, axes):
         """
@@ -187 +344 @@
         latFound=None
         lonFound=None
-        for ax in axes:
-            if len(ax)>1:
-                if ax.isLatitude(): latFound=minmax(ax)
-                if ax.isLongitude(): lonFound=minmax(ax)
+        
+        if type(axes[0])==type([1,2]): # set up from domainDict
+            for ax in axes:
+                if len(ax[2])>1:
+                    if ax[1]=="latitude": latFound=ax[2]
+                    if ax[1]=="longitude": lonFound=ax[2]
+        else: # type is cdms.axis
+            for ax in axes:
+                if len(ax)>1:
+                    if ax.isLatitude(): latFound=minmax(ax)
+                    if ax.isLongitude(): lonFound=minmax(ax)
+                    
         if latFound and lonFound:
             return (latFound, lonFound)
             
             
+    def _checkForTrajectoryFeature(self):
+        """
+        Returns 1 if it is a trajectory feature.
+        """
+        axisList=self.var.getAxisList()
+        if not axisList[0].isTime():
+            return None
+        
+        if len(axisList)>1 and axisList[1].id!="parcel":
+            return None
+                
+        # If axes look right check that we have lat and lon defined
+        # against time as well
+        fname=self.filename     
+        cdmsFile=cdms.open(fname)
+        varNames=[i.lower() for i in cdmsFile.listvariables()]
+        latNames=["latitude","lat","lt"]
+        lonNames=["longitude","lon","lng"]
+        if overlap(varNames, latNames) and overlap(varNames, lonNames):
+            for lnm in latNames:
+                try:
+                    lat=cdmsFile(lnm)
+                except:
+                    pass    
+            for lom in lonNames:
+                try:
+                    lon=cdmsFile(lom)
+                except:
+                    pass
+            print "Calculating bounding box for traj data..."
+            (y1,y2)=genutil.minmax(lat) # south, north
+            (x1,x2)=genutil.minmax(lon)
+            return (y1,x1,y2,x2)
+        else:
+            return None 
+        
+                            
+                            
 if __name__=="__main__":
-    v=VariableAnalyser("/tmp/tmp.nc", "var1")
+    a=VariableAnalyser("/data/var2.nc", "var2")
+    print a.plotOpts
+    a=VariableAnalyser(graphicalOutputType="2DLatLonPlot", domainDict={"ordered_axes":["time","latitude","longitude"],
+                "time":["time","time",[0,4]],
+                "latitude":["latitude","latitude",[0,90]],
+                "longitude":["longitude","longitude",[0,359]]})    
+    print a.plotConfigurationDict
+    a=VariableAnalyser("/data/traj.nc", "theta")
+    print a.plotOpts
+    a=VariableAnalyser("/data/traj.nc", "theta", "TrajectoriesOverMap")
+    print a.plotConfigurationDict    
+    v=VariableAnalyser("/data/var1.nc", "pqn")
+    print v.plotOpts    
+    v=VariableAnalyser("/data/var1.nc", "pqn")
     print v.plotOpts
-    a=VariableAnalyser("/tmp/tmp.nc", "var1", "2DPlot")
-    print a.plotConfigurationDict
+    #a=VariableAnalyser("/data/var1.nc", "pqn", "2DPlot")
+    #print a.plotConfigurationDict
+    
+    

TI04-geosplat/trunk/pygss/__init__.py

@@ -64 +64 @@
 from FeatureTypes import FeatureTypes
 
+# VariableAnalyser analyses single variables
+from VariableAnalyser import VariableAnalyser
+
+# CombinedPlotManager works out if any overlays are possible/acceptable
+from CombinedPlotManager import CombinedPlotManager
+
 # GSErrors holds all the GeoSPlAT error classes
 from GSErrors import *

TI04-geosplat/trunk/pygss/common.py

@@ -25 +25 @@
                       "resolution", "vertical_units", "vertical_domain", 
                        "outputFormat")
+
+GRAPHICAL_OUTPUT_TYPES_OR_STRING="PointValueAndMetadata|YvsXGraph|2DPlot|2DLatLonPlot|Animation|TrajectoriesOverMap|MultipleTrajectoriesOver2DLatLonPlot"
+GRAPHICAL_OUTPUT_TYPES=GRAPHICAL_OUTPUT_TYPES_OR_STRING.split("|")
 
 # Set up common functions
@@ -66 +69 @@
     return rtarray
 
-
+def normaliseXCoord(x):
+    """
+    Converts x values to somewhere in range (0,360)
+    """
+    if x<0:
+        return x+360
+    return x
+
+def getSpatialOverlap(bbox1, bbox2):
+    """
+    If no spatial overlap (i.e. < 2 deg of overlap in lat or lon)
+    then return None. Otherwise return the bounding box that covers 
+    both in a way that will be useful to plot. This may shift a global
+    coverage to a new startX, endX.
+    """
+    threshold=2 # degrees
+    t=threshold # quicker to type
+    (ya,xa,yb,xb)=bbox1 # (south,west,north,east)
+    (yc,xc,yd,xd)=bbox2
+    
+    n=normaliseXCoord
+    xa=n(xa)
+    xb=n(xb)
+    xc=n(xc)
+    xd=n(xd)
+    
+    if xc>=(xb-t) or xd<=(xa+t): return None
+    if yd<=(ya+t) or yc>=(yb-2): return None
+    
+    ybot=max(ya,yc)
+    ytop=min(yb,yd)
+    xbot=min(xa,xc)
+    xtop=max(xb,xd)
+    
+    # Now create a slight buffer so not touching edges (unless 90N and 90S)
+    ytop=ytop+t
+    ybot=ybot-t
+    if ytop>90: ytop=90
+    if ybot<-90: ybot=-90
+
+    return (ybot,xbot,ytop,xtop)  
+
+
+def getattrNone(item, attr):
+    """
+    Returns the attr of item or None.
+    """
+    if not hasattr(item, attr):
+        return None
+    return getattr(item, attr)
+
+def identifyLatLonVarIDs(cdmsFile):
+    """
+    Returns list of latID and lonID in file or cdmsFile object.
+    Any not found are returned as "None" type.
+    """
+    if type(cdmsFile)==type("filename"):
+        import cdms
+        f=cdms.open(cdmsFile)
+    else:
+        f=cdmsFile
+    varIDs=f.listvariables()
+    latLon=[None, None]
+    
+    lonPoss=("longitude", "Longitude", "Lon", "lon", "Lng", "lng")
+    latPoss=("latitude", "Latitude", "Lat", "lat")
+    
+    for varID in varIDs:
+        var=f[varID]
+        if getattrNone(var, "standard_name")=="latitude": latLon[0]=varID
+        if getattrNone(var, "standard_name")=="longitude": latLon[1]=varID
+        if getattrNone(var, "long_name") in latPoss: latLon[0]=varID
+        if getattrNone(var, "long_name") in lonPoss: latLon[1]=varID
+        if varID in latPoss: latLon[0]=varID
+        if varID in lonPoss: latLon[1]=varID
+        
+    return latLon
+    
 def translateURI(uri):
     """

TI04-geosplat/trunk/pygss/serverConfig.py

@@ -121 +121 @@
 # "/usr/local/gss" is recommended but you can change it as 
 # you wish.
-BASEDIR="/home/as56/abstractWebService/gss"
+BASEDIR="/usr/local/test/gss"
 
 # OUTPUT_DIR:
 # The full path on the local machine of the output directory.
-OUTPUT_DIR="/srv/www/htdocs/output"
+OUTPUT_DIR="/home/as56/apache/htdocs/gs/output"
 
 # OUTPUT_DIR_URL:
 # URL path to output directory.
-OUTPUT_DIR_URL="http://localhost/output"
+OUTPUT_DIR_URL="http://localhost/gs/output"
 
 # SESSION_OBJECT_DIR:
@@ -162 +162 @@
 # OUTPUT_FORMATS:
 # List of available output formats.
-OUTPUT_FORMATS=["NetCDF", "NASA Ames"]
+OUTPUT_FORMATS=["GIF", "Postscript", "CGM"]
 
 # LOCAL_PYTHONPATH:
@@ -186 +186 @@
 # SOURCE_NAME:
 # String to appear on plots.
-SOURCE_NAME="Source: British Atmospheric Data Centre (http://badc.nerc.ac.uk)"
+SOURCE_NAME="Source: YOUR_ORGANISATION"
 
 # CDAT_BIN_PATH:

TI04-geosplat/trunk/pygss/version.py

@@ -11 +11 @@
 """
 
-version="0.3.0"
+version="0.3.1"

TI04-geosplat/trunk/setup.py

@@ -38 +38 @@
 import sys, os, shutil, time, re
 from ConfigParser import ConfigParser
-version="0.3.0"
+version="0.3.1"
 overwrite="OFF"
 
@@ -157 +157 @@
                 print "Exiting setup without completing."
                 sys.exit()
+        
             
         if not os.path.isdir(BASEDIR):
@@ -168 +169 @@
             target=os.path.join(BASEDIR, item)
             if os.path.exists(target): 
+                if item in ("sessionObjects", "logs"): continue
                 os.system("rm -fr %s" % target)