Changeset 138 in tmcsimulator-scriptbuilder for trunk

Timestamp:

11/29/2017 10:06:59 AM (8 years ago)

Author:

bmcguffin

Message:

Added support for incident color. Color is now read from the xml file; if no color field exists, it picks a random one. Upon saving the file, color is written out in RGB format. The DTD now contains a new field, COLOR, with three attributes: r, g, b.

Location:

trunk

Files:

• Incidents/script.dtd (modified) (2 diffs)
• src/scriptbuilder/structures/ELEMENT.java (modified) (1 diff)
• src/scriptbuilder/structures/MyScriptHandler.java (modified) (7 diffs)
• src/scriptbuilder/structures/TimeSlice.java (modified) (1 diff)
• src/scriptbuilder/structures/XMLWriter.java (modified) (2 diffs)

trunk/Incidents/script.dtd

@@ -36 +36 @@
          <!ELEMENT COMMENT (#PCDATA)>
 
-   <!ELEMENT SCRIPT_EVENT (TIME_INDEX | INCIDENT | CAD_DATA | GENERAL_INFO |
+   <!ELEMENT SCRIPT_EVENT (TIME_INDEX | COLOR | INCIDENT | CAD_DATA | GENERAL_INFO |
       ATMS_EVALUATION | CAD_EVALUATION | ACTIVITY_LOG_EVALUATION | FACILITATOR_EVALUATION |
       RADIO_EVALUATION | CHP_RADIO | MAINTENANCE_RADIO | CMS_EVALUATION | TMT_RADIO | 
@@ -44 +44 @@
       <!ELEMENT INCIDENT (#PCDATA)>
          <!ATTLIST INCIDENT LogNum CDATA #REQUIRED>
+      <!ELEMENT COLOR EMPTY>
+         <!ATTLIST COLOR r CDATA #REQUIRED>
+         <!ATTLIST COLOR g CDATA #REQUIRED>
+         <!ATTLIST COLOR b CDATA #REQUIRED>
 
       <!ELEMENT CAD_DATA (HEADER_INFO | CAD_INCIDENT_EVENT | LOCATION_INFO | MASTER_INC_NUM |

trunk/src/scriptbuilder/structures/ELEMENT.java

@@ -103 +103 @@
     //They do have attributes.
     AUDIO,//EVENT
+    COLOR,
     TOW,//EVENT
     UNIT,//EVENT

trunk/src/scriptbuilder/structures/MyScriptHandler.java

@@ -6 +6 @@
 package scriptbuilder.structures;
 
+import java.awt.Color;
 import java.util.ArrayList;
 import java.util.Random;
@@ -239 +240 @@
     private CadData cad = null;
 
+    private Color incColor = null;
+
     /**
      * Constructor. Initializes incident map.
@@ -382 +385 @@
                 }
             }
+            else if (qName.equals(ELEMENT.COLOR.tag))
+            {
+                incColor = new Color(Integer.parseInt(attributes.getValue("r")),
+                        Integer.parseInt(attributes.getValue("g")),
+                        Integer.parseInt(attributes.getValue("b")));
+            }
             else if (qName.equals(ELEMENT.FACILITATOR_EVALUATION.tag))
             {
@@ -458 +467 @@
             {
                 cad = new CadData();
+                //Nullify color
+                //This gets overwritten if color tag exists
+                incColor = null;
             }
 
@@ -732 +744 @@
                 }
             }
+            else if (currentElement == ELEMENT.COLOR)
+            {
+                currInc.color = incColor;
+            }
             else if (currentElement == ELEMENT.EXPECTED_ACTION)
             {
@@ -887 +903 @@
                 if (incidentMap.get(incidentLogNumber) == null)
                 {
+                    Color newColor = SimulationScript.incidentColors[Math.abs(new Random().nextInt())
+                            % SimulationScript.incidentColors.length];
+
                     incidentMap.put(incidentLogNumber,
-                            new ScriptIncident(SimulationScript.incidentColors[Math.abs(new Random().nextInt()) % SimulationScript.incidentColors.length],
+                            new ScriptIncident(newColor,
                                     incidentLogNumber, currentIncName, currentIncidentDesc,
                                     script, (int) currentEventTime));
@@ -919 +938 @@
                     unit.Curr_Loc = pcData.remove(ELEMENT.CURR_LOC);
                 }
-                if (pcData.containsKey(ELEMENT.DESTINATION))
+                if (pcData.containsKey(ELEMENT.DESTINATION))    
                 {
                     unit.Destination = pcData.remove(ELEMENT.DESTINATION);

trunk/src/scriptbuilder/structures/TimeSlice.java

@@ -221 +221 @@
         output += XMLWriter.openTag(ELEMENT.INCIDENT.tag + " LogNum=\"" + thisIncident.number + "\"");
         output += thisIncident.name + XMLWriter.closeTag(ELEMENT.INCIDENT.tag);
+        output += XMLWriter.emptyTag(ELEMENT.COLOR.tag 
+                + " r=\"" + thisIncident.color.getRed() + "\""
+                + " g=\"" + thisIncident.color.getGreen() + "\""
+                + " b=\"" + thisIncident.color.getBlue() + "\"");
 
         if ((cadData != null && cadData.hasCadData()) || containsCADIncidentEvent())

trunk/src/scriptbuilder/structures/XMLWriter.java

@@ -112 +112 @@
                 + "<!ELEMENT FAX (#PCDATA)>\n"
                 + "<!ELEMENT COMMENT (#PCDATA)>\n"
-                + "<!ELEMENT SCRIPT_EVENT (TIME_INDEX | INCIDENT | CAD_DATA | GENERAL_INFO |\n"
+                + "<!ELEMENT SCRIPT_EVENT (TIME_INDEX | INCIDENT | COLOR | CAD_DATA | GENERAL_INFO |\n"
                 + "ATMS_EVALUATION | CAD_EVALUATION | ACTIVITY_LOG_EVALUATION | FACILITATOR_EVALUATION |\n"
                 + "RADIO_EVALUATION | CHP_RADIO | MAINTENANCE_RADIO | CMS_EVALUATION | TMT_RADIO | \n"
@@ -119 +119 @@
                 + "<!ELEMENT INCIDENT (#PCDATA)>\n"
                 + "<!ATTLIST INCIDENT LogNum CDATA #REQUIRED>\n"
+                + "<!ELEMENT COLOR EMPTY>\n"
+                + "<!ATTLIST COLOR r CDATA #REQUIRED>\n"
+                + "<!ATTLIST COLOR g CDATA #REQUIRED>\n"
+                + "<!ATTLIST COLOR b CDATA #REQUIRED>\n"
                 + "<!ELEMENT CAD_DATA (HEADER_INFO | CAD_INCIDENT_EVENT | LOCATION_INFO | MASTER_INC_NUM |\n"
                 + "P | ADDITIONAL_INFO | LOCATION | GENERAL)*>\n"