Changeset 61 in tmcsimulator-scriptbuilder for trunk

Timestamp:

08/19/2017 04:42:55 AM (9 years ago)

Author:

bmcguffin

Message:

Made a few cosmetic changes to the code. Added a statement in the update method of IncidentEditorFrame? which tries to set the maximum scale of the zoom slider at an appropriate level.

Location:

trunk

Files:

• jacoco.exec-1502754766722386000 (added)
• src/scriptbuilder/gui/IncidentEditorFrame.form (modified) (1 diff)
• src/scriptbuilder/gui/IncidentEditorFrame.java (modified) (4 diffs)
• src/scriptbuilder/gui/ScriptBuilderFrame.java (modified) (6 diffs)
• src/scriptbuilder/gui/application.properties (modified) (1 diff)
• src/scriptbuilder/gui/panels/ScriptBuilderTimelinePanel.java (modified) (1 diff)
• test/scriptbuilder/structures/SimulationScriptTest.java (modified) (1 diff)

trunk/src/scriptbuilder/gui/IncidentEditorFrame.form

@@ -424 +424 @@
       <Dimension value="[800, 700]"/>
     </Property>
-    <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-      <Dimension value="[945, 1545]"/>
-    </Property>
-    <Property name="size" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-      <Dimension value="[800, 700]"/>
-    </Property>
   </Properties>
   <SyntheticProperties>

trunk/src/scriptbuilder/gui/IncidentEditorFrame.java

@@ -9 +9 @@
 import java.awt.Adjustable;
 import java.awt.Color;
-import java.awt.Cursor;
 import java.awt.event.AdjustmentEvent;
 import java.awt.event.AdjustmentListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
-import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -25 +23 @@
 import javax.swing.DefaultListModel;
 import javax.swing.JButton;
-import javax.swing.JFileChooser;
-import javax.swing.JOptionPane;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
 import scriptbuilder.structures.ScriptEvent;
 import scriptbuilder.structures.ScriptEvent.ScriptEventType;
@@ -34 +28 @@
 import scriptbuilder.structures.ScriptIncident.IncidentFocusedEvent;
 import scriptbuilder.structures.ScriptIncident.SliceChangedEvent;
-import scriptbuilder.structures.SimulationScript;
 import scriptbuilder.structures.TimeSlice;
 import scriptbuilder.structures.events.I_ScriptEvent;
@@ -355 +348 @@
             //gotoIncident.setSelectedItem(i);
         }
+        zoomSlider.setMinimum(((timelineTickPanel.getVisibleRect().width - 20)
+                * ScriptBuilderGuiConstants.HORIZONTAL_TICK_RESOLUTION)
+                / Math.max(theIncident.length, 1));
+        zoomSlider.setMaximum(zoomSlider.getMinimum() + 20);
     }
 

trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java

@@ -8 +8 @@
 import java.awt.Adjustable;
 import java.awt.Color;
-import java.awt.Cursor;
 import java.awt.event.AdjustmentEvent;
 import java.awt.event.AdjustmentListener;
@@ -15 +14 @@
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Observable;
 import java.util.Observer;
@@ -23 +21 @@
 import java.util.logging.Logger;
 import javax.swing.DefaultListModel;
-import javax.swing.JButton;
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
@@ -1585 +1582 @@
         if (fc.showOpenDialog(this) == JFileChooser.APPROVE_OPTION)
         {
+            script = new SimulationScript();
             System.out.println(fc.getSelectedFile().getName());
             script.loadScriptFromFile(fc.getSelectedFile());
             script.saveFile = fc.getSelectedFile();
         }
+        update(script, script);
         zoomSlider.setValue(zoomSlider.getMinimum());
-        update(script, script);
+        repaint();
     }//GEN-LAST:event_fileOpenActionPerformed
 
@@ -1876 +1875 @@
     private void fileNewActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_fileNewActionPerformed
     {//GEN-HEADEREND:event_fileNewActionPerformed
-        System.out.println("NEW SCRIPT");
         script = new SimulationScript();
         script.update();
@@ -1897 +1895 @@
                 script.incidents.get(0));
 
-        System.out.println("RESULT = " + result.toString());
-
-        input = result.toString();
-
-        System.out.println("INPUT = " + input);
-
-        int i = 0;
-        for (ScriptIncident incident : script.incidents)
-        {
-            if (incident == null)
-            {
-                continue;
-            }
-            System.out.println((++i) + ": " + incident.toString());
-            if (incident.toString().equals(input))
-            {
-                inc = incident;
-            }
-        }
-
-        if (inc != null)
-        {
-            new IncidentEditorFrame(inc).setVisible(true);
+        if (result != null)
+        {
+            System.out.println("RESULT = " + result.toString());
+
+            input = result.toString();
+
+            System.out.println("INPUT = " + input);
+
+            int i = 0;
+            for (ScriptIncident incident : script.incidents)
+            {
+                if (incident == null)
+                {
+                    continue;
+                }
+                System.out.println((++i) + ": " + incident.toString());
+                if (incident.toString().equals(input))
+                {
+                    inc = incident;
+                }
+            }
+
+            if (inc != null)
+            {
+                new IncidentEditorFrame(inc).setVisible(true);
+            }
         }
         update(script, script);

trunk/src/scriptbuilder/gui/application.properties

@@ -1 @@
-#Mon, 14 Aug 2017 16:50:46 -0700
+#Mon, 14 Aug 2017 16:52:48 -0700
 
 Application.revision=0

trunk/src/scriptbuilder/gui/panels/ScriptBuilderTimelinePanel.java

@@ -188 +188 @@
             }
 
-            if (incident.slices.get(newSlice) != null)
+            if (incident.slices.get(newSlice) != null
+                    && getTopLevelAncestor() instanceof IncidentEditorFrame)
             {
                 ed.setVisible(true);

trunk/test/scriptbuilder/structures/SimulationScriptTest.java

@@ -7 +7 @@
 import java.util.Observable;
 import java.util.Observer;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import static junit.framework.Assert.assertFalse;
 import static junit.framework.Assert.assertTrue;