Changeset 796 for trunk/UTIL/PYTHON/mcd/proto

Timestamp:

Oct 1, 2012, 1:29:35 AM (12 years ago)

Author:

aslmd

Message:

UTIL PYTHON. Added local plot/map capability to MCD interface. Added possibility to set projection and title. Added possibility to map horizontal wind velocity

Location:

trunk/UTIL/PYTHON/mcd/proto

Files:

• cgi-bin/mcdcgi.py (modified) (5 diffs)
• index.html (modified) (1 diff)

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

@@ +1 @@
+###!/usr/bin/env python
 #!/usr/bin/python
 ###!/home/aymeric/Software/epd-7.0-2-rh5-x86/bin/python
@@ -12 +13 @@
 ##################################################
 ### ajouts et corrections par Franck Guyon 09/2012
+### ajouts suite a brainstorm equipe AS 10/2012
 
 import cgi, cgitb 
@@ -36 +38 @@
 # Get data from user-defined fields and define free dimensions
 # FG: add tests if var==None to have values in local without forms ones
+query.lat = -9999.
 getlat = form.getvalue("latitude")
-if getlat == None: getlat = 1
-if getlat == "all":  islatfree = 1 ; query.lat = -9999.
+if getlat == None: getlat = "1"
+if getlat == "all":  islatfree = 1 ; query.lats = -90. ; query.late = 90.
+elif ";" in getlat:  islatfree = 1 ; ind = getlat.find(";") ; query.lats = float(getlat[:ind]) ; query.late = float(getlat[ind+1:])
 else:                islatfree = 0 ; query.lat = float(getlat)
 
+query.lon = -9999.
 getlon = form.getvalue("longitude")
-if getlon == None: getlon = 1
-if getlon == "all":  islonfree = 1 ; query.lon = -9999.
+if getlon == None: getlon = "1"
+if getlon == "all":  islonfree = 1 ; query.lons = -180. ; query.lone = 180.
+elif ";" in getlon:  islonfree = 1 ; ind = getlon.find(";") ; query.lons = float(getlon[:ind]) ; query.lone = float(getlon[ind+1:])
 else:                islonfree = 0 ; query.lon = float(getlon)
 
+query.loct = -9999.
 getloct = form.getvalue("localtime")
-if getloct == None: getloct = 1
-if getloct == "all": isloctfree = 1 ; query.loct = -9999.
+if getloct == None: getloct = "1"
+if getloct == "all": isloctfree = 1 ; query.locts = 0. ; query.locte = 24.
+elif ";" in getloct: isloctfree = 1 ; ind = getloct.find(";") ; query.locts = float(getloct[:ind]) ; query.locte = float(getloct[ind+1:])
 else:                isloctfree = 0 ; query.loct = float(getloct)
 
+query.xz = -9999.
 getalt = form.getvalue("altitude")
-if getalt == None: getalt = 1
-if getalt == "all":  isaltfree = 1 ; query.xz = -9999.
+if getalt == None: getalt = "1"
+if getalt == "all":  isaltfree = 1 ; query.xzs = 0. ; query.xze = 120000.
+elif ";" in getalt:  isaltfree = 1 ; ind = getalt.find(";") ; query.xzs = float(getalt[:ind]) ; query.xze = float(getalt[ind+1:])
 else:                isaltfree = 0 ; query.xz = float(getalt)
 
@@ -96 +106 @@
 
 # reference name (to test which figures are already in the database)
-reference = str(islatfree)+str(islonfree)+str(isloctfree)+str(isaltfree)+query.getnameset()+str(var1)+str(var2)+str(var3)+str(var4)+str(iswind)+str(isfixedlt)
+reference = query.getnameset()+str(var1)+str(var2)+str(var3)+str(var4)+str(iswind)+str(isfixedlt)
 figname = '../img/'+reference+'.png'
 
@@ -127 +137 @@
 
     ### figure    
-    query.htmlmap2d(vartoplot,incwind=iswindlog,fixedlt=input_fixedlt,figname=figname) 
+    zetitle = "MCD v4.3 - Dust scenario "+str(query.dust)+" - Date is "+str(query.xdate)
+    query.htmlmap2d(vartoplot,incwind=iswindlog,fixedlt=input_fixedlt,figname=figname,title=zetitle) 
     #mpl.savefig("img/temp.png",dpi=110,bbox_inches='tight',pad_inches=0.4)
     #Image.open("img/temp.png").save(figname,'JPEG') ##lighter images   

trunk/UTIL/PYTHON/mcd/proto/index.html

@@ -96 +96 @@
 <td align="center">
 <b>CUSTOMIZE COORDINATES ON MARS</b><br />
+please give: a value (or) a range val1;val2 (or) 'all'<br />
 <ul>
-<li>Latitude <input type="text" size="3" name="latitude" value="0."> (write a value or 'all')
-<li>Longitude <input type="text" size="3" name="longitude" value="0."> (write a value or 'all')
-<li>Local Time <input type="text" size="2" name="localtime" value="0."> (write a value or 'all')
-<li>Altitude (m) <input type="text" size="3" name="altitude" value="10."> (write a value or 'all')
+<li>North Latitude <input type="text" size="7" name="latitude" value="0."> 
+<li>East Longitude <input type="text" size="7" name="longitude" value="0."> 
+<li>Local Time <input type="text" size="7" name="localtime" value="0."> 
+<li>Altitude (m) <input type="text" size="7" name="altitude" value="10."> 
 <!--
 <li>Latitude