Changeset 182 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder/structures

Timestamp:

01/11/2020 05:45:23 PM (6 years ago)

Author:

jdalbey

Message:

Modifications to ScriptBuilderFrame?, SimulationScript?, MyScriptHandler? to fix #217

Location:

trunk/src/scriptbuilder/structures

Files:

• MyScriptHandler.java (modified) (2 diffs)
• SimulationScript.java (modified) (2 diffs)

trunk/src/scriptbuilder/structures/MyScriptHandler.java

@@ -749 +749 @@
             else if (currentElement == ELEMENT.COLOR)
             {
-                currInc.color = incColor;
+                // Validate that the color read is actually a legal color
+                // then assign it to the incident
+                currInc.color = SimulationScript.incidentColors[SimulationScript.lookupColor(incColor)];
             }
             else if (currentElement == ELEMENT.EXPECTED_ACTION)
@@ -906 +908 @@
                 if (incidentMap.get(incidentLogNumber) == null)
                 {
+                    // Select a random color to display for this incident
+                    // Will be overriden if a color tag is provided.
                     Color newColor = SimulationScript.incidentColors[Math.abs(new Random().nextInt())
                             % SimulationScript.incidentColors.length];
-
+                    
                     incidentMap.put(incidentLogNumber,
                             new ScriptIncident(newColor,

trunk/src/scriptbuilder/structures/SimulationScript.java

@@ -33 +33 @@
 
     /**
-     * All default options for GUI colorings of incidents.
-     */
-    public static final Color[] incidentColors =
-    {
-        Color.BLACK,
-        Color.BLUE,
-        Color.RED,
-        new Color(0x38, 0x5E, 0x0F),
-        new Color(128, 0, 128),
-        Color.MAGENTA,
-        new Color(0x23, 0x6B, 0x8E),
-        Color.ORANGE,
-        new Color(0x60, 0x33, 0x11),
-        Color.GRAY
-    };
-
+     * Strings to show in the incident color combo box.  Last item should be black,
+     * which will be used if invalid color is provided to lookupColor().
+     */
+    public static final String[] colorNames = {"BLUE", "RED", "CYAN", "GREEN", 
+        "ORANGE", "MAGENTA", "YELLOW", "BLACK"};
+    /** 
+     * Allowed color choices for incident display. 
+     * These colors must match the items in colorNames.
+     */
+    public static final Color[] incidentColors = {Color.BLUE, Color.RED, Color.CYAN, 
+        Color.GREEN, Color.ORANGE, Color.MAGENTA, Color.YELLOW, Color.BLACK};
     /**
      * The file to which this script will be saved.
@@ -428 +423 @@
         return count;
     }
-
+    
+    /** Given a color, find its index in the incidentColors.
+     * @param color a java color 
+     * @return the index of color in incidentColors, or last index if color isn't 
+     * in incidentColors.  The last item in incidentColors should be black.
+     */
+    public static int lookupColor(Color color)
+    {
+        int idx = 0;
+        // search color array for target
+        while(idx < incidentColors.length && !incidentColors[idx].equals(color))
+        { 
+            idx++;
+        }
+        // if color not found, return index of last item.
+        if (idx == incidentColors.length) 
+        {
+            return idx-1;
+        }
+        else return idx;
+    }
 }