Changeset 348 in tmcsimulator

Timestamp:

03/26/2019 09:13:54 AM (7 years ago)

Author:

jdalbey

Message:

Added gotoxmltime.html and other prototypes for ei notebook. They can be removed when no longer needed.

Location:

trunk/webapps

Files:

• cptms.html (modified) (2 diffs)
• gototime.html (added)
• gotoxmltime.html (added)
• highway_status.json (modified) (18 diffs)
• js/common.js (modified) (1 diff)
• poem.js (added)
• runTimer.py (added)
• sample_events.xml (added)
• scrolldemo.html (added)
• showtime.html (added)
• sim_clock.json (added)
• timescroller.html (added)

trunk/webapps/cptms.html

@@ -48 +48 @@
         <input id='cmsID' value="" type='hidden'/>
         <div id="message-input">Phase 1:
-        <input id="msgcontent1" class="cms-input"  maxlength="16" type="text"/><br><br>
-        <input id="msgcontent2" class="cms-input"  maxlength="16" type="text"/><br><br>
-        <input id="msgcontent3" class="cms-input"  maxlength="16" type="text"/><br><br><br>
+        <input id="msgcontent1" class="cms-input"  maxlength="16" type="text" oninput="this.value = this.value.toUpperCase()"/><br><br>
+        <input id="msgcontent2" class="cms-input"  maxlength="16" type="text" oninput="this.value = this.value.toUpperCase()"/><br><br>
+        <input id="msgcontent3" class="cms-input"  maxlength="16" type="text" oninput="this.value = this.value.toUpperCase()"/><br><br><br>
         Phase 2:
-        <input id="msgcontent4" class="cms-input"  maxlength="16" type="text"/><br><br>
-        <input id="msgcontent5" class="cms-input"  maxlength="16" type="text"/><br><br>
-        <input id="msgcontent6" class="cms-input"  maxlength="16" type="text"/><br><br>
+        <input id="msgcontent4" class="cms-input"  maxlength="16" type="text" oninput="this.value = this.value.toUpperCase()"/><br><br>
+        <input id="msgcontent5" class="cms-input"  maxlength="16" type="text" oninput="this.value = this.value.toUpperCase()"/><br><br>
+        <input id="msgcontent6" class="cms-input"  maxlength="16" type="text" oninput="this.value = this.value.toUpperCase()"/><br><br>
         </div>        
         <div id="buttonPanel"    style="display: block;"><br><br>
@@ -77 +77 @@
         <input id='harID' value="" type='hidden'/>
         <!--div id="har-message-input"-->Proposed:<br>
-        <input id="har-msgcontent1" class="har-input" type="text" size="50"><br>
+        <input id="har-msgcontent1" class="har-input" type="text" size="50" oninput="this.value = this.value.toUpperCase()"><br>
         <!--textarea id="har-msgcontent1" maxlength="150" rows="2" cols="50"/><br><br-->
 

trunk/webapps/highway_status.json

@@ -198 +198 @@
        },
    "properties": 
-       {"street": "JEFFREY 2", "color": "lime", "perpx": "0.142134", "perpy": "0.989847"}
+       {"street": "JEFFREY 2", "color": "yellow", "perpx": "0.142134", "perpy": "0.989847"}
 },  
 {
@@ -308 +308 @@
        },
    "properties": 
-       {"street": "HARVARD", "color": "lime", "perpx": "0.320278", "perpy": "0.947323"}
+       {"street": "HARVARD", "color": "yellow", "perpx": "0.320278", "perpy": "0.947323"}
 },  
 {
@@ -330 +330 @@
        },
    "properties": 
-       {"street": "JAMBOREE1", "color": "lime", "perpx": "0.400805", "perpy": "0.916164"}
+       {"street": "JAMBOREE1", "color": "yellow", "perpx": "0.400805", "perpy": "0.916164"}
 },  
 {
@@ -352 +352 @@
        },
    "properties": 
-       {"street": "JAMBOREE2", "color": "lime", "perpx": "0.400805", "perpy": "0.916164"}
+       {"street": "JAMBOREE2", "color": "yellow", "perpx": "0.400805", "perpy": "0.916164"}
 },  
 {
@@ -374 +374 @@
        },
    "properties": 
-       {"street": "MACARTHUR 1", "color": "lime", "perpx": "0.408917", "perpy": "0.912572"}
+       {"street": "MACARTHUR 1", "color": "yellow", "perpx": "0.408917", "perpy": "0.912572"}
 },  
 {
@@ -418 +418 @@
        },
    "properties": 
-       {"street": "RED HILL", "color": "lime", "perpx": "0.126754", "perpy": "0.991934"}
+       {"street": "RED HILL", "color": "red", "perpx": "0.126754", "perpy": "0.991934"}
 },  
 {
@@ -440 +440 @@
        },
    "properties": 
-       {"street": "BRISTOL 1", "color": "lime", "perpx": "0.0", "perpy": "1.0"}
+       {"street": "BRISTOL 1", "color": "red", "perpx": "0.0", "perpy": "1.0"}
 },  
 {
@@ -462 +462 @@
        },
    "properties": 
-       {"street": "BRISTOL 2", "color": "lime", "perpx": "0.0", "perpy": "1.0"}
+       {"street": "BRISTOL 2", "color": "red", "perpx": "0.0", "perpy": "1.0"}
 },  
 {
@@ -495 +495 @@
        },
    "properties": 
-       {"street": "FAIRVIEW", "color": "lime", "perpx": "0", "perpy": "0"}
+       {"street": "FAIRVIEW", "color": "red", "perpx": "0", "perpy": "0"}
 },  
 {
@@ -1200 +1200 @@
        },
    "properties": 
-       {"street": "EL TORO 1", "color": "lime", "perpx": "0.647648", "perpy": "0.761939"}
+       {"street": "EL TORO 1", "color": "red", "perpx": "0.647648", "perpy": "0.761939"}
 },  
 {
@@ -1244 +1244 @@
        },
    "properties": 
-       {"street": "LAKE FOR2", "color": "lime", "perpx": "0", "perpy": "0"}
+       {"street": "LAKE FOR2", "color": "red", "perpx": "0", "perpy": "0"}
 },  
 {
@@ -2292 +2292 @@
        },
    "properties": 
-       {"street": "BAKER 2", "color": "lime", "perpx": "-0.639107", "perpy": "0.769118"}
+       {"street": "BAKER 2", "color": "red", "perpx": "-0.639107", "perpy": "0.769118"}
 },  
 {
@@ -2325 +2325 @@
        },
    "properties": 
-       {"street": "PAULARINO 1", "color": "lime", "perpx": "-0.722093", "perpy": "0.691796"}
+       {"street": "PAULARINO 1", "color": "red", "perpx": "-0.722093", "perpy": "0.691796"}
 },  
 {
@@ -2336 +2336 @@
        },
    "properties": 
-       {"street": "PAULARINO 2", "color": "lime", "perpx": "0.719864", "perpy": "-0.694115"}
+       {"street": "PAULARINO 2", "color": "yellow", "perpx": "0.719864", "perpy": "-0.694115"}
 },  
 {
@@ -2347 +2347 @@
        },
    "properties": 
-       {"street": "PAULARINO 2", "color": "lime", "perpx": "-0.725185", "perpy": "0.688554"}
+       {"street": "PAULARINO 2", "color": "red", "perpx": "-0.725185", "perpy": "0.688554"}
 },  
 {
@@ -2358 +2358 @@
        },
    "properties": 
-       {"street": "MACARTHU1", "color": "lime", "perpx": "-0.710326", "perpy": "0.703873"}
+       {"street": "MACARTHU1", "color": "yellow", "perpx": "-0.710326", "perpy": "0.703873"}
 },  
 {
@@ -2380 +2380 @@
        },
    "properties": 
-       {"street": "MACARTHU2", "color": "lime", "perpx": "-0.710326", "perpy": "0.703873"}
+       {"street": "MACARTHU2", "color": "yellow", "perpx": "-0.710326", "perpy": "0.703873"}
 },  
 {
@@ -2435 +2435 @@
        },
    "properties": 
-       {"street": "EDINGER 1", "color": "lime", "perpx": "0", "perpy": "0"}
+       {"street": "EDINGER 1", "color": "yellow", "perpx": "0", "perpy": "0"}
 },  
 {

trunk/webapps/js/common.js

@@ -4 +4 @@
     {
         var xobj = new XMLHttpRequest();
-        xobj.overrideMimeType("application/json");
+        // Assume XML unless filename ends with .json
+        if (inFile.endsWith(".json"))
+        {
+            xobj.overrideMimeType("application/json");
+        }
         xobj.open('GET', inFile, true);
         xobj.onreadystatechange = function()