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

Timestamp:

Oct 18, 2013, 5:24:05 PM (11 years ago)

Author:

aslmd

Message:

UTIL PYTHON. MCD online. previous changes after progress meeting were not committed.

Location:

trunk/UTIL/PYTHON/mcd/proto

Files:

• cgi-bin/mcdcgi.py (modified) (2 diffs)
• index4.html (modified) (2 diffs)
• index5.html (modified) (2 diffs)

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

@@ -145 +145 @@
 if badrange: 
     errormess = errormess+"<li>One or several coordinate intervals are not... intervals. Set either a real range or an unique value."
+if query.xdate == 666.:
+    errormess = "<li>CONGRATULATIONS! <br><img src='../surprise.jpg'><br> You reached secret mode.<br> You can <a href='http://www.youtube.com/watch?v=fTpQOZcNASw'>watch a nice video</a>."
 
 # Get how many free dimensions we have
@@ -196 +198 @@
 else:                  query.zonmean=False
 
+islog = form.getvalue("islog")
+if islog  == "on": query.islog=True
+else:              query.islog=False
+
 ### now, proceed...
 if errormess == "":
 
  # reference name (to test which figures are already in the database)
- try: reference = query.getnameset()+str(var1)+str(var2)+str(var3)+str(var4)+str(iswind)+str(isfixedlt)+str(iszonmean)+query.colorm+str(query.min2d)+str(query.max2d)+str(query.dpi)
+ try: reference = query.getnameset()+str(var1)+str(var2)+str(var3)+str(var4)+str(iswind)+str(isfixedlt)+str(iszonmean)+query.colorm+str(query.min2d)+str(query.max2d)+str(query.dpi)+str(islog)
  except: reference = "test"
  if yeaheps:  figname = '../img/'+reference+'.eps'

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

@@ -286 +286 @@
 <input type="radio" name="zonmean" value="on"          /> on
 </li>
+<li>Log(values) in 1D plots
+<input type="radio" name="islog" value="off" checked /> off
+<input type="radio" name="islog" value="on" /> on
+</li>
 </ul>
 </td>
@@ -303 +307 @@
 <a href="http://www-mars.lmd.jussieu.fr">Mars Climate Database</a> (c) LMD/OU/IAA/ESA/CNES.<br />
 Interface written by <a href="http://www.lmd.jussieu.fr/~aslmd/">A. Spiga</a> (LMD) using <a href="http://www.python.org">Python</a>.<br />
+Javascript time conversion by <a href="http://www.lmd.jussieu.fr/~emlmd">E. Millour</a> (<a href="http://www-mars.lmd.jussieu.fr/mars/time/martian_time.html">link</a>).
 </td>
 </tr>

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

@@ -389 +389 @@
 <input type="radio" name="zonmean" value="on"          /> on
 </li>
+<li>Log(values) in 1D plots
+<input type="radio" name="islog" value="off" checked /> off
+<input type="radio" name="islog" value="on" /> on 
+</li>
 </ul>
 </td>
@@ -406 +410 @@
 <a href="http://www-mars.lmd.jussieu.fr">Mars Climate Database</a> (c) LMD/OU/IAA/ESA/CNES.<br />
 Interface written by <a href="http://www.lmd.jussieu.fr/~aslmd/">A. Spiga</a> (LMD) using Python.<br />
+Javascript time conversion by <a href="http://www.lmd.jussieu.fr/~emlmd">E. Millour</a> (<a href="http://www-mars.lmd.jussieu.fr/mars/time/martian_time.html">link</a>).
 </td>
 </tr>