Changeset 117 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder/structures/ScriptIncident.java

Timestamp:

09/07/2017 02:08:40 PM (9 years ago)

Author:

bmcguffin

Message:

Redesigned the method by which the first event in an event is added to relative time 00:00:00.

Added a second timestamp panel to the incident editor screen, which displays absolute script time in red. The original timestamp panel displays time relative to the start of the incident, in black.

File:

• trunk/src/scriptbuilder/structures/ScriptIncident.java (modified) (1 diff)

trunk/src/scriptbuilder/structures/ScriptIncident.java

@@ -188 +188 @@
     public void addNewEvent(I_ScriptEvent ev, int start)
     {
-        //The first event in the incident defines its start point, so it should
-        //be placed at time 0
-        if (start != 0 && slices.size() == 0)
-        {
-            addNewEvent(ev, 0);
-        }
-
+        //Check to see if there's already a timeslice here
+        TimeSlice t = slices.get(start);
+        //If not, make one; then, add the event to it
+        if (t == null)
+        {
+            t = new TimeSlice(start, this);
+            t.addEvent(ev);
+            slices.put(start, t);
+        }
         else
         {
-            //Check to see if there's already a timeslice here
-            TimeSlice t = slices.get(start);
-            //If not, make one; then, add the event to it
-            if (t == null)
-            {
-                t = new TimeSlice(start, this);
-                t.addEvent(ev);
-                slices.put(start, t);
-            }
-            else
-            {
-                t.addEvent(ev);
-            }
-            eventCount++;
-
-            //If this is the latest start time in the incident, update that number
-            if (start > latestStart)
-            {
-                latestStart = start;
-            }
+            t.addEvent(ev);
+        }
+        eventCount++;
+
+        //If this is the latest start time in the incident, update that number
+        if (start > latestStart)
+        {
+            latestStart = start;
+        }
             //If this event is earlier than all previous events, or if there are 
-            //no other events, the offset is equal to this event's start time
-            if (start < offset || eventCount == 1)
-            {
-                offset = start;
-                //System.out.println("Offset: " + offset);
-            }
-            updateLength();
-        }
+        //no other events, the offset is equal to this event's start time
+        if (start < offset || eventCount == 1)
+        {
+            offset = start;
+            //System.out.println("Offset: " + offset);
+        }
+        updateLength();
     }