Changeset 138 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder/structures/MyScriptHandler.java

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.

File:

• trunk/src/scriptbuilder/structures/MyScriptHandler.java (modified) (7 diffs)

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);