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

Timestamp:

Oct 15, 2012, 12:00:39 AM (12 years ago)

Author:

aslmd

Message:

UTIL PYTHON mcd online. improved interface for time (earth and mars). improved titles.

Location:

trunk/UTIL/PYTHON/mcd/proto

Files:

• cgi-bin/mcdcgi.py (modified) (2 diffs)
• index.html (modified) (3 diffs)

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

@@ -69 +69 @@
 if sumfree > 2: exit() ## only 1D or 2D plots for the moment
 
-try: query.xdate = float(form.getvalue("ls"))
-except: query.xdate = float(1)
+try: query.datekey = int(form.getvalue("datekeyhtml"))
+except: query.datekey = float(1)
+if query.datekey == 1:
+    try: query.xdate = float(form.getvalue("ls"))
+    except: query.xdate = float(1)
+else:
+    try: query.xdate = float(form.getvalue("julian"))
+    except: query.xdate = float(1)
+    query.loct = 0.
+
 try: query.hrkey = int(form.getvalue("hrkey"))
 except: query.hrkey = int(1)
@@ -156 +164 @@
 #print "<br />"
 
+print "<a href='../index.html'>Click here to start a new query</a><br />"
+
 ## Now the part which differs
 if sumfree == 0:        query.update() ; query.htmlprinttabextvar(vartoplot)  #query.printmeanvar()
-elif sumfree >= 1:      print "<a href='../index.html'>Click here to start a new query</a><br /><img src='"+figname+"'><br />"
+elif sumfree >= 1:      print "<img src='"+figname+"'><br />"
 else:                   print "<h1>ERROR : sumfree is not or badly defined ...</h1></body></html>"
 

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

@@ -50 +50 @@
 </td>
 <td align="center">
-<b>CUSTOMIZE EARTH TIME</b><br />
-Year / Month / Day @ hh:mm:ss [UTC]<br />
+<input type="radio" name="datekeyhtml" value="1" checked>
+<b><font color="red">MARS date</font></b> 
+Solar longitude <input type="text" size="3" name="ls"> degrees<br />
+Local Time <input type="text" size="4" name="localtime" value="0."> Martian hour<br />
+<input type="radio" name="datekeyhtml" value="0">
+<b><font color="blue">EARTH date</font></b> 
+YY / MM / DD @ hh:mm:ss<br />
 <input type="text" size="3" name="year"> / <input type="text" size="1" name="month"> / <input type="text" size="1" name="day"> @
-<input type="text" size="1" name="hours">:<input type="text" size="1" name="minutes">:<input type="text" size="1" name="seconds"><br />
-<input type="button" value="SAVE CHANGES" onClick="Convert2Ls();" style="font-weight:bold"><br />
+<input type="text" size="1" name="hours">:<input type="text" size="1" name="minutes">:<input type="text" size="1" name="seconds">
+UTC<br />
 </td>
 <td align="center">
 Earth Julian Date <input type="text" size="6" name="julian" readonly="readonly"><br />
-Martian year <input type="text" size="1" name="martianyear" readonly="readonly"> <br />
-Martian month <input type="text" size="1" name="martianmonth" readonly="readonly"> / 12<br />
-Martian sol <input type="text" size="2" name="sol" readonly="readonly"> / 669
+Martian year <input type="text" size="1" name="martianyear" readonly="readonly"> 
+month <input type="text" size="1" name="martianmonth" readonly="readonly"> / 12 <br />
+Martian sol <input type="text" size="2" name="sol" readonly="readonly"> / 669<br />
+<input type="button" value="EARTH DATE >>> MARS DATE" onClick="Convert2Ls();"><br />
 </td>
 </tr>
@@ -98 +104 @@
 write a value (or) a range val1;val2 (or) 'all'<br />
 <ul>
-<li>Latitude <input type="text" size="7" name="latitude" value="0."> degree North 
+<li>Latitude <input type="text" size="7" name="latitude" value="0."> degree North
 <li>Longitude <input type="text" size="7" name="longitude" value="0."> degree East
-<li>Local Time <input type="text" size="7" name="localtime" value="0."> Martian hour
 <li>Altitude <input type="text" size="9" name="altitude" value="10."> <select name="zkey">
 <option value="1"         >m (O: Mars center)</option>
@@ -131 +136 @@
 <!--[Advanced settings for well-informed Martians]<br />-->
 <ul>
-<li>Force Mars solar longitude to be <input type="text" size="3" name="ls"> degrees</li> 
 <li>High resolution topography? <input type="radio" name="hrkey" value="1" checked /> Yes <input type="radio" name="hrkey" value="0" /> No </li>
 <li>Dust scenario? <select name="dust">