Changeset 107 in tmcsimulator-scriptbuilder for trunk

Timestamp:

09/05/2017 01:18:00 PM (9 years ago)

Author:

bmcguffin

Message:

Fixed a bug where deleting the first timeslice of an incident would not alter the reported start time of the incident.

Location:

trunk/src/scriptbuilder

Files:

• gui/IncidentEditorFrame.java (modified) (1 diff)
• structures/ScriptEvent.java (modified) (1 diff)
• structures/ScriptIncident.java (modified) (1 diff)
• structures/TimeSlice.java (modified) (1 diff)

trunk/src/scriptbuilder/gui/IncidentEditorFrame.java

@@ -307 +307 @@
             public void windowClosing(WindowEvent e)
             {
-                theIncident.setOffset(savedOffset);
+                //Add previous offset back in
+                //If we didn't adjust the offset, this will just set it to the old value
+                //If we deleted the first event(s), this will add the offsets,
+                //to ensure that events stay at the correct times
+                theIncident.setOffset(theIncident.offset + savedOffset);
                 parent.returnFocus();
             }

trunk/src/scriptbuilder/structures/ScriptEvent.java

@@ -196 +196 @@
     {
         this.slice.events.remove(this);
+        this.slice.checkEmpty();
     }
     

trunk/src/scriptbuilder/structures/ScriptIncident.java

@@ -375 +375 @@
         return this.number + " - " + this.name;
     }
+    
+    /**
+     * Remove the timeslice at the given position.
+     * 
+     * @param seconds absolute start time of the timeslice to remove.
+     */
+    public void removeTimeSlice(int seconds)
+    {
+        //remove the timeslice
+        this.slices.remove(seconds);
+        
+        //offset is equivalent to start time of earliest slice
+        if(seconds == offset)
+        {
+            offset = slices.firstKey();
+        }
+        this.updateLength();
+        script.update();
+    }
 }

trunk/src/scriptbuilder/structures/TimeSlice.java

@@ -297 +297 @@
                 || ev instanceof WitnessEvent || ev instanceof CADEvent;
     }
+    
+    public void checkEmpty()
+    {
+        if (this.events.isEmpty())
+        {
+            this.thisIncident.removeTimeSlice(this.seconds);
+        }
+    }
 }