- Timestamp:
- 04/11/2019 08:24:22 AM (7 years ago)
- Location:
- trunk
- Files:
-
- 10 edited
-
IDE_metadata/NetBeans/TMCSim/nbproject/configs/CADClient.properties (modified) (1 diff)
-
scripts/adhoc_incidents.xml (modified) (2 diffs)
-
scripts/full_script_2016.xml (modified) (2 diffs)
-
src/tmcsim/application.properties (modified) (1 diff)
-
src/tmcsim/client/CADClient.java (modified) (1 diff)
-
src/tmcsim/client/cadclientgui/screens/AssignedIncidents.java (modified) (1 diff)
-
webapps/EInotebook/notebook.css (modified) (1 diff)
-
webapps/EInotebook/scripts/LoadEvents.js (modified) (1 diff)
-
webapps/highway_status.json (modified) (9 diffs)
-
webapps/sim_elapsedtime.json (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/CADClient.properties
r59 r361 1 1 main.class=tmcsim.client.CADClient 2 run.jvmargs=-DCONFIG_DIR=config/testConfig -Djava.util.logging.config.file=config/testConfig/cad_client_logging.properties -
trunk/scripts/adhoc_incidents.xml
r338 r361 2 2 3 3 <TMC_SCRIPT title="An Empty Script for ad hoc incidents"> 4 <SCRIPT_DATA>5 <NEW_UNIT UnitNum = "20-01"></NEW_UNIT>6 <NEW_UNIT UnitNum = "20-02"></NEW_UNIT>7 <NEW_UNIT UnitNum = "20-03"></NEW_UNIT>8 <NEW_UNIT UnitNum = "20-04"></NEW_UNIT>9 <NEW_UNIT UnitNum = "20-05"></NEW_UNIT>10 <NEW_UNIT UnitNum = "20-06"></NEW_UNIT>11 <NEW_UNIT UnitNum = "20-07"></NEW_UNIT>12 <NEW_UNIT UnitNum = "20-08"></NEW_UNIT>13 <NEW_UNIT UnitNum = "20-09"></NEW_UNIT>14 <NEW_UNIT UnitNum = "20-10"></NEW_UNIT>15 </SCRIPT_DATA>16 4 <SCRIPT_EVENT> 17 5 <TIME_INDEX>00:00:00</TIME_INDEX> … … 19 7 <CAD_DATA> 20 8 <MASTER_INC_NUM>A201</MASTER_INC_NUM> 9 <HEADER_INFO> 10 <Beat>20-01</Beat> 11 </HEADER_INFO> 21 12 <CAD_INCIDENT_EVENT> 22 13 <UNIT UnitNum="20-01" Status="ENRT" Primary="true" Active="true"/> -
trunk/scripts/full_script_2016.xml
r16 r361 316 316 317 317 <TELEPHONE> 318 < STUDENT>Places a call to CHP Dispatch to notify of stalled DOT vehicle.</STUDENT>318 <INSTRUCTOR Role="DOT Driver">Places a call to CHP Dispatch to notify of stalled DOT vehicle.</INSTRUCTOR> 319 319 </TELEPHONE> 320 320 … … 3136 3136 <GENERAL_INFO> 3137 3137 <TITLE>Incident Description</TITLE> 3138 <TEXT> Incident Description -This is a collision involving a tanker truck3138 <TEXT>This is a collision involving a tanker truck 3139 3139 and a car that block the #3 and 4 lanes on NB I-5 just north of 3140 3140 Main Street. There are 2 minor injured and 1 major injured. -
trunk/src/tmcsim/application.properties
r360 r361 1 #Thu, 04 Apr 2019 15:32:24-07001 #Thu, 11 Apr 2019 09:48:15 -0700 2 2 3 Application.revision=3 563 Application.revision=360 4 4 5 5 Application.buildnumber=121 -
trunk/src/tmcsim/client/CADClient.java
r310 r361 260 260 // Create the CAD Client thread to run the CADClientModel Object. 261 261 Thread clientThread = new Thread(theClientScreenModel); 262 263 // Log that everything started okay 262 264 clientThread.start(); 265 cadClientLogger.logp(Level.INFO, "CAD Client", 266 "Constructor", 267 "Initialization complete."); 263 268 264 269 ensureProperShutdown(); 270 271 265 272 } 266 273 -
trunk/src/tmcsim/client/cadclientgui/screens/AssignedIncidents.java
r290 r361 139 139 // Fetch the unit's current status from server 140 140 UnitStatusEnums ustatus = ScreenManager.theCoordinator.getCadDataUnitStatus(unitname); 141 // Ad-hoc incidents don't have a status so use WHITE 142 comp.setForeground(Color.WHITE); 141 143 // Decide which color to use for displaying the status 142 144 switch (ustatus) -
trunk/webapps/EInotebook/notebook.css
r359 r361 78 78 text-align: right; 79 79 font-weight: bold; 80 font-size: x -large; /*1.2em; */80 font-size: xx-large; /*1.2em; */ 81 81 color: purple; 82 82 /* width: 30%; */ -
trunk/webapps/EInotebook/scripts/LoadEvents.js
r359 r361 21 21 } 22 22 23 // Parse the entire Incident XML Script file 24 // Extract the Incidents and Events and create lists of each 23 25 function parseXml(response) 24 26 { 25 var parser = new DOMParser(); 26 xmlDoc = parser.parseFromString(response,"text/xml"); 27 var eventTags = xmlDoc.getElementsByTagName("SCRIPT_EVENT"); 27 // Create a parser and grab the high level tag we're interested in 28 var parser = new DOMParser(); 29 xmlDoc = parser.parseFromString(response,"text/xml"); 30 var eventTags = xmlDoc.getElementsByTagName("SCRIPT_EVENT"); 28 31 29 // Process each event tag 30 for (var i = 0; i < eventTags.length; i++) 32 // Process each SCRIPT_EVENT tag 33 for (var i = 0; i < eventTags.length; i++) 34 { 35 var currEvt = eventTags[i]; 36 // local variable declarations 37 var timeFields; var evtTime; var incidentNum; var cadProp; var telProp; 38 var proparray = new Array(); 39 var evalarray = new Array(); 40 // Process all the children of one event 41 for (var child = 1; child < currEvt.childNodes.length; child++) 31 42 { 32 var currEvt = eventTags[i]; 33 // Process all the children of one event 34 var timeFields; var evtTime; var incidentNum; var cadProp; var telProp; 35 var proparray = new Array(); 36 var evalarray = new Array(); 37 for (var child = 1; child < currEvt.childNodes.length; child++) 43 // Ignore undefined nodes 44 if (currEvt.childNodes[child].localName != undefined) 38 45 { 39 if (currEvt.childNodes[child].localName != undefined) 46 // Determine the tag type and dispatch it for further processing 47 switch(currEvt.childNodes[child].localName) 40 48 { 41 switch(currEvt.childNodes[child].localName) 42 { 43 case "TIME_INDEX": 44 timeFields = currEvt.childNodes[child].textContent.split(":"); 45 evtTime = new Time(Number(timeFields[0]), Number(timeFields[1]), Number(timeFields[2])); 46 break; 47 case "INCIDENT": 48 incidentNum = Number(currEvt.childNodes[child].attributes["LogNum"].value); 49 break; 50 case "CAD_DATA": 51 var caddata = parseCAD(currEvt.childNodes[child]); 52 if (caddata.length > 0) 53 { 54 cadProp = new Property("CHP CAD", caddata ); 55 proparray.push(cadProp); 56 } 57 break; 58 case "TELEPHONE": 59 telProp = new Evaluation("Telephone Conversation", 60 parseTelephone(currEvt.childNodes[child]) ); 61 evalarray.push(telProp); 62 break; 63 case "CHP_RADIO": 64 var chpradio = parseCHPradio(currEvt.childNodes[child]); 65 if (chpradio.length > 0) 66 { 67 cadProp = new Property("CHP RADIO", chpradio ); 68 proparray.push(cadProp); 69 } 70 break; 71 case "TMT_RADIO": break; 72 case "MAINTENANCE_RADIO": break; 73 // case *_EVALUATION: break; 49 case "TIME_INDEX": 50 timeFields = currEvt.childNodes[child].textContent.split(":"); 51 evtTime = new Time(Number(timeFields[0]), Number(timeFields[1]), Number(timeFields[2])); 52 break; 53 case "INCIDENT": 54 incidentNum = Number(currEvt.childNodes[child].attributes["LogNum"].value); 55 break; 56 case "GENERAL_INFO": break; 57 case "CAD_DATA": 58 var caddata = parseCAD(currEvt.childNodes[child]); 59 if (caddata.length > 0) 60 { 61 cadProp = new Property("CHP CAD", caddata ); 62 proparray.push(cadProp); 63 } 64 break; 65 case "TELEPHONE": 66 telProp = new Evaluation("Telephone Conversation", 67 parseTelephone(currEvt.childNodes[child]) ); 68 evalarray.push(telProp); 69 break; 70 case "CHP_RADIO": 71 var chpradio = parseCHPradio(currEvt.childNodes[child]); 72 if (chpradio.length > 0) 73 { 74 cadProp = new Property("CHP RADIO", chpradio ); 75 proparray.push(cadProp); 76 } 77 break; 78 case "TMT_RADIO": break; 79 case "MAINTENANCE_RADIO": break; 80 // case *_EVALUATION: break; 74 81 75 }76 82 } 77 83 } 78 //console.log(evtTime.format(), incidentNum, proparray.length, evalarray.length);79 if (incidentNum != undefined)80 {81 events.add(new Event(evtTime, incidents.get(incidentNum), new Properties(proparray),82 new Evaluations(evalarray)) );83 }84 84 } 85 //console.log(evtTime.format(), incidentNum, proparray.length, evalarray.length); 86 if (incidentNum != undefined) 87 { 88 events.add(new Event(evtTime, incidents.get(incidentNum), new Properties(proparray), 89 new Evaluations(evalarray)) ); 90 } 91 } 85 92 86 93 } -
trunk/webapps/highway_status.json
r359 r361 1277 1277 }, 1278 1278 "properties": 1279 {"street": "PAULARINO 2", "color": " yellow", "perpx": "0.719864", "perpy": "-0.694115"}1279 {"street": "PAULARINO 2", "color": "lime", "perpx": "0.719864", "perpy": "-0.694115"} 1280 1280 }, 1281 1281 { … … 1497 1497 }, 1498 1498 "properties": 1499 {"street": "MACARTHU2", "color": " red", "perpx": "-0.710326", "perpy": "0.703873"}1499 {"street": "MACARTHU2", "color": "yellow", "perpx": "-0.710326", "perpy": "0.703873"} 1500 1500 }, 1501 1501 { … … 1508 1508 }, 1509 1509 "properties": 1510 {"street": "DYER 2", "color": " red", "perpx": "-0.708914", "perpy": "0.705295"}1510 {"street": "DYER 2", "color": "lime", "perpx": "-0.708914", "perpy": "0.705295"} 1511 1511 }, 1512 1512 { … … 1519 1519 }, 1520 1520 "properties": 1521 {"street": "EDINGER 1", "color": " yellow", "perpx": "0", "perpy": "0"}1521 {"street": "EDINGER 1", "color": "lime", "perpx": "0", "perpy": "0"} 1522 1522 }, 1523 1523 { … … 2117 2117 }, 2118 2118 "properties": 2119 {"street": "JAMBOREE1", "color": " yellow", "perpx": "0.400805", "perpy": "0.916164"}2119 {"street": "JAMBOREE1", "color": "lime", "perpx": "0.400805", "perpy": "0.916164"} 2120 2120 }, 2121 2121 { … … 2128 2128 }, 2129 2129 "properties": 2130 {"street": "JAMBOREE2", "color": " red", "perpx": "0.400805", "perpy": "0.916164"}2130 {"street": "JAMBOREE2", "color": "lime", "perpx": "0.400805", "perpy": "0.916164"} 2131 2131 }, 2132 2132 { … … 2139 2139 }, 2140 2140 "properties": 2141 {"street": "MACARTHUR 1", "color": " red", "perpx": "0.408917", "perpy": "0.912572"}2141 {"street": "MACARTHUR 1", "color": "lime", "perpx": "0.408917", "perpy": "0.912572"} 2142 2142 }, 2143 2143 { … … 2150 2150 }, 2151 2151 "properties": 2152 {"street": "AIRPORT", "color": " red", "perpx": "0.321527", "perpy": "0.9469"}2152 {"street": "AIRPORT", "color": "lime", "perpx": "0.321527", "perpy": "0.9469"} 2153 2153 }, 2154 2154 { … … 2161 2161 }, 2162 2162 "properties": 2163 {"street": "RED HILL", "color": " red", "perpx": "0.126754", "perpy": "0.991934"}2163 {"street": "RED HILL", "color": "lime", "perpx": "0.126754", "perpy": "0.991934"} 2164 2164 }, 2165 2165 { -
trunk/webapps/sim_elapsedtime.json
r358 r361 1 {"elapsedtime":" 479"}1 {"elapsedtime":"173"}
Note: See TracChangeset
for help on using the changeset viewer.
