Index: /trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/CADClient.properties =================================================================== --- /trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/CADClient.properties (revision 59) +++ /trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/CADClient.properties (revision 361) @@ -1,1 +1,2 @@ main.class=tmcsim.client.CADClient +run.jvmargs=-DCONFIG_DIR=config/testConfig -Djava.util.logging.config.file=config/testConfig/cad_client_logging.properties Index: /trunk/webapps/EInotebook/notebook.css =================================================================== --- /trunk/webapps/EInotebook/notebook.css (revision 359) +++ /trunk/webapps/EInotebook/notebook.css (revision 361) @@ -78,5 +78,5 @@ text-align: right; font-weight: bold; - font-size: x-large; /*1.2em; */ + font-size: xx-large; /*1.2em; */ color: purple; /* width: 30%; */ Index: /trunk/webapps/EInotebook/scripts/LoadEvents.js =================================================================== --- /trunk/webapps/EInotebook/scripts/LoadEvents.js (revision 359) +++ /trunk/webapps/EInotebook/scripts/LoadEvents.js (revision 361) @@ -21,66 +21,73 @@ } +// Parse the entire Incident XML Script file +// Extract the Incidents and Events and create lists of each function parseXml(response) { - var parser = new DOMParser(); - xmlDoc = parser.parseFromString(response,"text/xml"); - var eventTags = xmlDoc.getElementsByTagName("SCRIPT_EVENT"); + // Create a parser and grab the high level tag we're interested in + var parser = new DOMParser(); + xmlDoc = parser.parseFromString(response,"text/xml"); + var eventTags = xmlDoc.getElementsByTagName("SCRIPT_EVENT"); - // Process each event tag - for (var i = 0; i < eventTags.length; i++) + // Process each SCRIPT_EVENT tag + for (var i = 0; i < eventTags.length; i++) + { + var currEvt = eventTags[i]; + // local variable declarations + var timeFields; var evtTime; var incidentNum; var cadProp; var telProp; + var proparray = new Array(); + var evalarray = new Array(); + // Process all the children of one event + for (var child = 1; child < currEvt.childNodes.length; child++) { - var currEvt = eventTags[i]; - // Process all the children of one event - var timeFields; var evtTime; var incidentNum; var cadProp; var telProp; - var proparray = new Array(); - var evalarray = new Array(); - for (var child = 1; child < currEvt.childNodes.length; child++) + // Ignore undefined nodes + if (currEvt.childNodes[child].localName != undefined) { - if (currEvt.childNodes[child].localName != undefined) + // Determine the tag type and dispatch it for further processing + switch(currEvt.childNodes[child].localName) { - switch(currEvt.childNodes[child].localName) - { - case "TIME_INDEX": - timeFields = currEvt.childNodes[child].textContent.split(":"); - evtTime = new Time(Number(timeFields[0]), Number(timeFields[1]), Number(timeFields[2])); - break; - case "INCIDENT": - incidentNum = Number(currEvt.childNodes[child].attributes["LogNum"].value); - break; - case "CAD_DATA": - var caddata = parseCAD(currEvt.childNodes[child]); - if (caddata.length > 0) - { - cadProp = new Property("CHP CAD", caddata ); - proparray.push(cadProp); - } - break; - case "TELEPHONE": - telProp = new Evaluation("Telephone Conversation", - parseTelephone(currEvt.childNodes[child]) ); - evalarray.push(telProp); - break; - case "CHP_RADIO": - var chpradio = parseCHPradio(currEvt.childNodes[child]); - if (chpradio.length > 0) - { - cadProp = new Property("CHP RADIO", chpradio ); - proparray.push(cadProp); - } - break; - case "TMT_RADIO": break; - case "MAINTENANCE_RADIO": break; - // case *_EVALUATION: break; + case "TIME_INDEX": + timeFields = currEvt.childNodes[child].textContent.split(":"); + evtTime = new Time(Number(timeFields[0]), Number(timeFields[1]), Number(timeFields[2])); + break; + case "INCIDENT": + incidentNum = Number(currEvt.childNodes[child].attributes["LogNum"].value); + break; + case "GENERAL_INFO": break; + case "CAD_DATA": + var caddata = parseCAD(currEvt.childNodes[child]); + if (caddata.length > 0) + { + cadProp = new Property("CHP CAD", caddata ); + proparray.push(cadProp); + } + break; + case "TELEPHONE": + telProp = new Evaluation("Telephone Conversation", + parseTelephone(currEvt.childNodes[child]) ); + evalarray.push(telProp); + break; + case "CHP_RADIO": + var chpradio = parseCHPradio(currEvt.childNodes[child]); + if (chpradio.length > 0) + { + cadProp = new Property("CHP RADIO", chpradio ); + proparray.push(cadProp); + } + break; + case "TMT_RADIO": break; + case "MAINTENANCE_RADIO": break; + // case *_EVALUATION: break; - } } } - //console.log(evtTime.format(), incidentNum, proparray.length, evalarray.length); - if (incidentNum != undefined) - { - events.add(new Event(evtTime, incidents.get(incidentNum), new Properties(proparray), - new Evaluations(evalarray)) ); - } } + //console.log(evtTime.format(), incidentNum, proparray.length, evalarray.length); + if (incidentNum != undefined) + { + events.add(new Event(evtTime, incidents.get(incidentNum), new Properties(proparray), + new Evaluations(evalarray)) ); + } + } } Index: /trunk/webapps/highway_status.json =================================================================== --- /trunk/webapps/highway_status.json (revision 359) +++ /trunk/webapps/highway_status.json (revision 361) @@ -1277,5 +1277,5 @@ }, "properties": - {"street": "PAULARINO 2", "color": "yellow", "perpx": "0.719864", "perpy": "-0.694115"} + {"street": "PAULARINO 2", "color": "lime", "perpx": "0.719864", "perpy": "-0.694115"} }, { @@ -1497,5 +1497,5 @@ }, "properties": - {"street": "MACARTHU2", "color": "red", "perpx": "-0.710326", "perpy": "0.703873"} + {"street": "MACARTHU2", "color": "yellow", "perpx": "-0.710326", "perpy": "0.703873"} }, { @@ -1508,5 +1508,5 @@ }, "properties": - {"street": "DYER 2", "color": "red", "perpx": "-0.708914", "perpy": "0.705295"} + {"street": "DYER 2", "color": "lime", "perpx": "-0.708914", "perpy": "0.705295"} }, { @@ -1519,5 +1519,5 @@ }, "properties": - {"street": "EDINGER 1", "color": "yellow", "perpx": "0", "perpy": "0"} + {"street": "EDINGER 1", "color": "lime", "perpx": "0", "perpy": "0"} }, { @@ -2117,5 +2117,5 @@ }, "properties": - {"street": "JAMBOREE1", "color": "yellow", "perpx": "0.400805", "perpy": "0.916164"} + {"street": "JAMBOREE1", "color": "lime", "perpx": "0.400805", "perpy": "0.916164"} }, { @@ -2128,5 +2128,5 @@ }, "properties": - {"street": "JAMBOREE2", "color": "red", "perpx": "0.400805", "perpy": "0.916164"} + {"street": "JAMBOREE2", "color": "lime", "perpx": "0.400805", "perpy": "0.916164"} }, { @@ -2139,5 +2139,5 @@ }, "properties": - {"street": "MACARTHUR 1", "color": "red", "perpx": "0.408917", "perpy": "0.912572"} + {"street": "MACARTHUR 1", "color": "lime", "perpx": "0.408917", "perpy": "0.912572"} }, { @@ -2150,5 +2150,5 @@ }, "properties": - {"street": "AIRPORT", "color": "red", "perpx": "0.321527", "perpy": "0.9469"} + {"street": "AIRPORT", "color": "lime", "perpx": "0.321527", "perpy": "0.9469"} }, { @@ -2161,5 +2161,5 @@ }, "properties": - {"street": "RED HILL", "color": "red", "perpx": "0.126754", "perpy": "0.991934"} + {"street": "RED HILL", "color": "lime", "perpx": "0.126754", "perpy": "0.991934"} }, { Index: /trunk/webapps/sim_elapsedtime.json =================================================================== --- /trunk/webapps/sim_elapsedtime.json (revision 358) +++ /trunk/webapps/sim_elapsedtime.json (revision 361) @@ -1,1 +1,1 @@ -{"elapsedtime":"479"} +{"elapsedtime":"173"} Index: /trunk/scripts/adhoc_incidents.xml =================================================================== --- /trunk/scripts/adhoc_incidents.xml (revision 338) +++ /trunk/scripts/adhoc_incidents.xml (revision 361) @@ -2,16 +2,4 @@ - - - - - - - - - - - - 00:00:00 @@ -19,4 +7,7 @@ A201 + + 20-01 + Index: /trunk/scripts/full_script_2016.xml =================================================================== --- /trunk/scripts/full_script_2016.xml (revision 16) +++ /trunk/scripts/full_script_2016.xml (revision 361) @@ -316,5 +316,5 @@ - Places a call to CHP Dispatch to notify of stalled DOT vehicle. + Places a call to CHP Dispatch to notify of stalled DOT vehicle. @@ -3136,5 +3136,5 @@ Incident Description - Incident Description - This is a collision involving a tanker truck + This is a collision involving a tanker truck and a car that block the #3 and 4 lanes on NB I-5 just north of Main Street. There are 2 minor injured and 1 major injured. Index: /trunk/src/tmcsim/application.properties =================================================================== --- /trunk/src/tmcsim/application.properties (revision 360) +++ /trunk/src/tmcsim/application.properties (revision 361) @@ -1,5 +1,5 @@ -#Thu, 04 Apr 2019 15:32:24 -0700 +#Thu, 11 Apr 2019 09:48:15 -0700 -Application.revision=356 +Application.revision=360 Application.buildnumber=121 Index: /trunk/src/tmcsim/client/CADClient.java =================================================================== --- /trunk/src/tmcsim/client/CADClient.java (revision 310) +++ /trunk/src/tmcsim/client/CADClient.java (revision 361) @@ -260,7 +260,14 @@ // Create the CAD Client thread to run the CADClientModel Object. Thread clientThread = new Thread(theClientScreenModel); + + // Log that everything started okay clientThread.start(); + cadClientLogger.logp(Level.INFO, "CAD Client", + "Constructor", + "Initialization complete."); ensureProperShutdown(); + + } Index: /trunk/src/tmcsim/client/cadclientgui/screens/AssignedIncidents.java =================================================================== --- /trunk/src/tmcsim/client/cadclientgui/screens/AssignedIncidents.java (revision 290) +++ /trunk/src/tmcsim/client/cadclientgui/screens/AssignedIncidents.java (revision 361) @@ -139,4 +139,6 @@ // Fetch the unit's current status from server UnitStatusEnums ustatus = ScreenManager.theCoordinator.getCadDataUnitStatus(unitname); + // Ad-hoc incidents don't have a status so use WHITE + comp.setForeground(Color.WHITE); // Decide which color to use for displaying the status switch (ustatus)