Changeset 182 in tmcsimulator-scriptbuilder

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

Files:

• gui/ScriptBuilderFrame.form (modified) (1 diff)
• gui/ScriptBuilderFrame.java (modified) (10 diffs)
• structures/MyScriptHandler.java (modified) (2 diffs)
• structures/SimulationScript.java (modified) (2 diffs)

trunk/src/scriptbuilder/gui/ScriptBuilderFrame.form

@@ -479 +479 @@
           <Properties>
             <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
-              <Connection code="new DefaultComboBoxModel(colorModel)" type="code"/>
+              <Connection code="new DefaultComboBoxModel(SimulationScript.colorNames)" type="code"/>
             </Property>
           </Properties>

trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java

@@ -84 +84 @@
      */
     private Color selectedColor;
-     /**
-     * Strings to show in the incident color combo box
-     */
-    private final String[] colorModel = {"BLUE", "RED", "CYAN", "GREEN", 
-        "ORANGE", "MAGENTA", "YELLOW", "BLACK"};
-    /** 
-     * Allowed color choices. These colors must match the items in the combobox.
-     */
-    private final Color[] colorChoices = {Color.BLUE, Color.RED, Color.CYAN, 
-        Color.GREEN, Color.ORANGE, Color.MAGENTA, Color.YELLOW, Color.BLACK};
+
     /**
      * Get the script currently in use.
@@ -712 +703 @@
         jLabel2.setText("Incident Type:");
 
-        colorComboBox.setModel(new DefaultComboBoxModel(colorModel));
+        colorComboBox.setModel(new DefaultComboBoxModel(SimulationScript.colorNames));
         colorComboBox.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -1348 +1339 @@
 
         scriptBuilderMenuBar.addAncestorListener(new javax.swing.event.AncestorListener() {
+            public void ancestorMoved(javax.swing.event.AncestorEvent evt) {
+            }
             public void ancestorAdded(javax.swing.event.AncestorEvent evt) {
                 scriptBuilderMenuBarAncestorAdded(evt);
             }
             public void ancestorRemoved(javax.swing.event.AncestorEvent evt) {
-            }
-            public void ancestorMoved(javax.swing.event.AncestorEvent evt) {
             }
         });
@@ -1631 +1622 @@
 
     /**
-     * Executed when the "OK" button is pressed on the Incident editor. If
+     * Executed when the "OK" button is pressed on the Incident properties window. If
      * incident is new, and is valid, adds it to the model and updates. If
      * editing existing incident, verifies changes are valid and applies them.
@@ -1813 +1804 @@
         addIncidentStart.setValue(0);
         txtIncidentLength.setText("0");
-        selectedColor = colorChoices[0];
-        incidentColorField.setBackground(colorChoices[0]);
+        selectedColor = SimulationScript.incidentColors[0];
+        incidentColorField.setBackground(selectedColor);
         colorComboBox.setSelectedIndex(0);
         addIncidentDescription.setText("");
@@ -1960 +1951 @@
         //addIncidentLength.setValue(i.length / 60);
         incidentColorField.setBackground(i.color);
-        colorComboBox.setSelectedIndex(lookupColor(i.color));
+        colorComboBox.setSelectedIndex(SimulationScript.lookupColor(i.color));
         selectedColor = i.color;
         addIncidentDescription.setText(i.description);
@@ -2362 +2353 @@
 
     private void incidentDetailsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_incidentDetailsActionPerformed
-        // TODO add your handling code here:
         Object[] incidentList = script.incidents.toArray();
         ScriptIncident i = (ScriptIncident) JOptionPane.showInputDialog(
@@ -2387 +2377 @@
             //addIncidentLength.setValue(i.length / 60);
             incidentColorField.setBackground(i.color);
-            colorComboBox.setSelectedIndex(lookupColor(i.color));
+            colorComboBox.setSelectedIndex(SimulationScript.lookupColor(i.color));
             selectedColor = i.color;
             addIncidentDescription.setText(i.description);
@@ -2444 +2434 @@
         // Save the chosen color
         int index = colorComboBox.getSelectedIndex();
-        selectedColor = colorChoices[index];
+        selectedColor = SimulationScript.incidentColors[index];
         incidentColorField.setBackground(selectedColor);
     }//GEN-LAST:event_colorSelectedHandler
-    /** Given a color, find its index in the color Choices.
-     * @param color a java color 
-     * @pre color exists in color choices
-     */
-    private int lookupColor(Color color)
-    {
-        int idx = 0;
-        while(idx < colorChoices.length && colorChoices[idx] != color)
-        { 
-            idx++;
-        }
-        return idx;
-    }
+
 
     /**
@@ -2505 +2483 @@
         {
             UIManager.setLookAndFeel("com.sun.java.swing.plaf.gtk.GTKLookAndFeel");
+            //UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+            //UIManager.setLookAndFeel("com.sun.java.swing.plaf.motif.MotifLookAndFeel");
         }
         catch (Exception ex)

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;
+    }
 }