Changeset 761 for trunk/UTIL/PYTHON/mcd/proto/cgi-bin

Timestamp:

Aug 19, 2012, 12:19:59 AM (13 years ago)

Author:

aslmd

Message:

UTIL PYTHON : a more definitive version of what could make a new and simple MCD web interface. added a lot of capabilities: variable setting, beginner mode, wind vector, fixed or not local time, etc etc etc. some modifications were made to the python MCD interface too (this makes the basis for the web interface).

File:

• trunk/UTIL/PYTHON/mcd/proto/cgi-bin/mcdcgi.py (modified) (6 diffs)

trunk/UTIL/PYTHON/mcd/proto/cgi-bin/mcdcgi.py

@@ -4 +4 @@
 ##################################################
 ### A Python CGI for the Mars Climate Database ###
-### -------------------------------------------###
-### Aymeric SPIGA 18-19/04/2012                ###
-### -------------------------------------------###
+### ------------------------------------------ ###
+### Aymeric SPIGA 18-19/04/2012 ~ 11/08/2012   ###
+### ------------------------------------------ ###
 ### (see mcdtest.py for examples of use)       ###
 ##################################################
@@ -27 +27 @@
 query = mcd()
 
-# Get data from user-defined fields
-query.lat = float(form.getvalue("latitude"))
-query.lon = float(form.getvalue("longitude"))
-query.loct = float(form.getvalue("localtime"))
+# Get data from user-defined fields and define free dimensions
+getlat = form.getvalue("latitude")
+if getlat == "all":  islatfree = 1 ; query.lat = -9999.
+else:                islatfree = 0 ; query.lat = float(getlat)
+getlon = form.getvalue("longitude")
+if getlon == "all":  islonfree = 1 ; query.lon = -9999.
+else:                islonfree = 0 ; query.lon = float(getlon)
+getloct = form.getvalue("localtime")
+if getloct == "all": isloctfree = 1 ; query.loct = -9999.
+else:                isloctfree = 0 ; query.loct = float(getloct)
+getalt = form.getvalue("altitude")
+if getalt == "all":  isaltfree = 1 ; query.xz = -9999.
+else:                isaltfree = 0 ; query.xz = float(getalt)
+sumfree = islatfree + islonfree + isloctfree + isaltfree 
+if sumfree > 2: exit() ## only 1D or 2D plots for the moment
 query.xdate = float(form.getvalue("ls"))
-query.xz = float(form.getvalue("altitude"))
 query.hrkey = int(form.getvalue("hrkey"))
 query.dust = int(form.getvalue("dust"))
@@ -40 +50 @@
 #        self.gwlength  = 0. #gravity Wave wavelength (unused if perturkey=0)
 
-# Get free dimensions
-islatfree  = float(form.getvalue("islatfree"))
-islonfree  = float(form.getvalue("islonfree"))
-isloctfree = float(form.getvalue("isloctfree"))
-isaltfree  = float(form.getvalue("isaltfree"))
-sumfree = islatfree + islonfree + isloctfree + isaltfree 
-if sumfree > 2: exit() ## only 1D or 2D plots for the moment
+# Get variables to plot
+var1 = form.getvalue("var1")
+var2 = form.getvalue("var2")
+var3 = form.getvalue("var3")
+var4 = form.getvalue("var4")
+vartoplot = [var1]
+if var2 != "none": vartoplot = np.append(vartoplot,var2)
+if var3 != "none": vartoplot = np.append(vartoplot,var3)
+if var4 != "none": vartoplot = np.append(vartoplot,var4)
+iswind = form.getvalue("iswind")
+if iswind == "on": iswindlog = True
+else:              iswindlog = False
+isfixedlt = form.getvalue("isfixedlt")
+if isfixedlt == "on": input_fixedlt=True
+else:                 input_fixedlt=False  
 
 # reference name (to test which figures are already in the database)
-reference = str(islatfree)+str(islonfree)+str(isloctfree)+str(isaltfree)+query.getnameset()
+reference = str(islatfree)+str(islonfree)+str(isloctfree)+str(isaltfree)+query.getnameset()+str(var1)+str(var2)+str(var3)+str(var4)+str(iswind)+str(isfixedlt)
 figname = 'img/'+reference+'.jpg'
 testexist = daos.path.isfile(figname)
@@ -67 +85 @@
 
     ### generic building of figure
-    query.plot1d(["t","p","u","v"],vertplot=isaltfree)    
+    #query.plot1d(["t","p","u","v"],vertplot=isaltfree)
+    query.plot1d(vartoplot,vertplot=isaltfree)
     mpl.savefig("img/temp.png",dpi=85,bbox_inches='tight',pad_inches=0.25)
     Image.open("img/temp.png").save(figname,'JPEG')
@@ -77 +96 @@
     if islatfree == 1 and islonfree == 1:       query.latlon()   
     else:                                       exit()  
-    
-    query.map2d(["t","u"]) 
+
+    ### figure    
+    query.map2d(vartoplot,incwind=iswindlog,fixedlt=input_fixedlt) 
     mpl.savefig("img/temp.png",dpi=110,bbox_inches='tight',pad_inches=0.4)
     Image.open("img/temp.png").save(figname,'JPEG') ##lighter images   
@@ -92 +112 @@
 
 ## Now the part which differs
-if sumfree == 0:        query.update() ; query.printmeanvar()  
+if sumfree == 0:        query.update() ; query.htmlprinttabextvar(vartoplot)  #query.printmeanvar()
 elif sumfree >= 1:      print "<img src='../"+figname+"'><br />"
 else:                   exit()
 
 ## This is quite common
-print "Based on the <a href='http://www-mars.lmd.jussieu.fr'>Mars Climate Database</a> (c) LMD/OU/IAA/ESA/CNES.<br />"
+#print "Based on the <a href='http://www-mars.lmd.jussieu.fr'>Mars Climate Database</a> (c) LMD/OU/IAA/ESA/CNES.<br />"
 print "<hr>"
-query.printset()
+print "<a href='../index.html'>Click here to start a new query</a>."
+#query.printset()
+print "<hr>"
 print "</body>"
 print "</html>"