Changeset 122 in tmcsimulator-scriptbuilder for trunk

Timestamp:

09/19/2017 02:15:02 PM (9 years ago)

Author:

bmcguffin

Message:

Added message panel warning user, if the first event placed in an incident is placed at a time other than 00:00:00, that the event will be moved to time 00:00:00 relative to the start of the incident.

Commented out code in ScriptIncident?.addNewEvent which rounds event start times to the nearest minute. I need to find a better solution which doesn't damage the program's ability to accurately generate scripts.

Location:

trunk/src/scriptbuilder

Files:

• gui/application.properties (modified) (1 diff)
• gui/panels/IncidentTimelinePanel.java (modified) (1 diff)
• structures/ScriptIncident.java (modified) (2 diffs)

trunk/src/scriptbuilder/gui/application.properties

@@ -1 @@
-#Thu, 14 Sep 2017 11:38:45 -0700
+#Tue, 19 Sep 2017 15:12:22 -0700
 
 Application.revision=0

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

@@ -243 +243 @@
                 if (getTopLevelAncestor() instanceof IncidentEditorFrame)
                 {
-                    if (incident.slices.size() == 0)
+                    if (incident.slices.size() == 0 && newSlice != 0)
                     {
+                        JOptionPane.showMessageDialog(g, "This is the first event in the incident.\n"
+                                + "Therefore, it will be automatically positioned at time 00:00:00,\n"
+                                + "relative to the start of the incident.", "Event will be moved", JOptionPane.INFORMATION_MESSAGE);
                         newSlice = 0;
                     }

trunk/src/scriptbuilder/structures/ScriptIncident.java

@@ -188 +188 @@
     public void addNewEvent(I_ScriptEvent ev, int start)
     {
+        /*
         int leftoverSeconds = start % 60;
         
@@ -202 +203 @@
             }
         }
+        */
         
         //Check to see if there's already a timeslice here