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

Timestamp:

Oct 20, 2012, 11:45:11 AM (12 years ago)

Author:

aslmd

Message:

UTIL PYTHON mcd interface. added option to print ASCII file. added sanity checks. topography contours are all solid lines. html section have cleaner bounds for axis. allowed for more separator namely , and /

File:

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

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

@@ -43 +43 @@
 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:])
+elif "," in getlat:  islatfree = 1 ; ind = getlat.find(",") ; query.lats = float(getlat[:ind]) ; query.late = float(getlat[ind+1:])
+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)
 
@@ -50 +52 @@
 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:])
+elif "," in getlon:  islonfree = 1 ; ind = getlon.find(",") ; query.lons = float(getlon[:ind]) ; query.lone = float(getlon[ind+1:])
+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)
 
@@ -57 +61 @@
 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:])
+elif "," in getloct: isloctfree = 1 ; ind = getloct.find(",") ; query.locts = float(getloct[:ind]) ; query.locte = float(getloct[ind+1:])
+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)
 
@@ -73 +79 @@
     elif query.zkey == 1:  query.xzs = 3396000. ; query.xze = 3596000.
 elif ";" in getalt:  isaltfree = 1 ; ind = getalt.find(";") ; query.xzs = float(getalt[:ind]) ; query.xze = float(getalt[ind+1:])
+elif "," in getalt:  isaltfree = 1 ; ind = getalt.find(",") ; query.xzs = float(getalt[:ind]) ; query.xze = float(getalt[ind+1:])
+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)
 
@@ -124 +132 @@
 reference = query.getnameset()+str(var1)+str(var2)+str(var3)+str(var4)+str(iswind)+str(isfixedlt)
 figname = '../img/'+reference+'.png'
+txtname = '../txt/'+reference
 testexist = daos.path.isfile(figname)
 
@@ -133 +142 @@
 
     ### getting data
-    if isloctfree == 1:         query.diurnal(nd=24)
+    if isloctfree == 1:         query.diurnal(nd=24) 
     elif islonfree == 1:        query.zonal()
     elif islatfree == 1:        query.meridional()
@@ -140 +149 @@
 
     ### generic building of figure
+    query.getascii(vartoplot,filename=txtname)
     query.htmlplot1d(vartoplot,figname=figname)
     #mpl.savefig("img/temp.png",dpi=85,bbox_inches='tight',pad_inches=0.25)
@@ -178 +188 @@
 ## Now the part which differs
 if sumfree == 0:        query.update() ; query.htmlprinttabextvar(vartoplot)  #query.printmeanvar()
-elif sumfree >= 1:      print "<img src='"+figname+"'><br />"
+elif sumfree == 2:      print "<img src='"+figname+"'><br />"
+elif sumfree == 1:      
+    print "<a href='"+txtname+"'>Click here to download an ASCII file containing data</a><br />"
+    print "<img src='"+figname+"'><br />"
 else:                   print "<h1>ERROR : sumfree is not or badly defined ...</h1></body></html>"