Changeset 111 in tmcsimulator-scriptbuilder for trunk

Timestamp:

09/05/2017 05:48:12 PM (9 years ago)

Author:

bmcguffin

Message:

Annotated these files. Fixed a bug that caused newly created incidents to have the wrong offset when new events were added.

Location:

trunk

Files:

• jacoco.exec-1504662543350657000 (added)
• src/scriptbuilder/gui/application.properties (modified) (1 diff)
• src/scriptbuilder/structures/ScriptIncident.java (modified) (6 diffs)
• src/scriptbuilder/structures/TimeSlice.java (modified) (3 diffs)
• test/scriptbuilder/structures/SimulationScriptTest.java (modified) (1 diff)

trunk/src/scriptbuilder/gui/application.properties

@@ -1 @@
-#Fri, 01 Sep 2017 13:13:39 -0700
+#Tue, 05 Sep 2017 18:53:17 -0700
 
 Application.revision=0

trunk/src/scriptbuilder/structures/ScriptIncident.java

@@ -158 +158 @@
         this.offset = offset;
         TreeMap<Integer, TimeSlice> newSlices = new TreeMap<Integer, TimeSlice>();
-        
+
         int latest = 0;
-        
-        for(Integer k : slices.keySet())
+
+        for (Integer k : slices.keySet())
         {
             newSlices.put(k + (offset - old), slices.get(k));
             latest = k + (offset - old);
         }
-        
+
         latestStart = latest;
 
@@ -173 +173 @@
             ts.shift(offset - old);
         }
-        
+
         slices = newSlices;
         updateLength();
@@ -188 +188 @@
     public void addNewEvent(I_ScriptEvent ev, int start)
     {
+        //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)
         {
-            //System.out.println("Generating new slice at time " + start);
             t = new TimeSlice(start, this);
             t.addEvent(ev);
@@ -202 +203 @@
         eventCount++;
 
+        //If this is the latest start time in the incident, update that number
         if (start > latestStart)
         {
             latestStart = start;
-            //System.out.println("Latest Start: " + latestStart);
-        }
-        if (start < offset)
+        }
+        //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;
@@ -375 +378 @@
         return this.number + " - " + this.name;
     }
-    
+
     /**
      * Remove the timeslice at the given position.
-     * 
+     *
      * @param seconds absolute start time of the timeslice to remove.
      */
@@ -385 +388 @@
         //remove the timeslice
         this.slices.remove(seconds);
-        
+
         //offset is equivalent to start time of earliest slice
-        if(seconds == offset)
+        if (seconds == offset)
         {
             offset = slices.firstKey();

trunk/src/scriptbuilder/structures/TimeSlice.java

@@ -213 +213 @@
         }
 
-        System.out.println("Seconds:: " + seconds);
         String output = XMLWriter.openTag(ELEMENT.SCRIPT_EVENT.tag);
         SimpleDateFormat df = new SimpleDateFormat("HH:mm:ss");
@@ -275 +274 @@
         }
         output += XMLWriter.closeTag(ELEMENT.SCRIPT_EVENT.tag);
-        System.out.println(output);
         return output;
     }
@@ -297 +295 @@
                 || ev instanceof WitnessEvent || ev instanceof CADEvent;
     }
-    
+
     public void checkEmpty()
     {

trunk/test/scriptbuilder/structures/SimulationScriptTest.java

@@ -235 +235 @@
         assertEquals(11, result);
 
-        ((ScriptEvent) instance.incidents.get(0).slices.get(0).events.get(0)).length = 45;
+        ((ScriptEvent) instance.incidents.get(0).slices.get(10).events.get(0)).length = 45;
         instance.incidents.get(0).updateLength();
         assertEquals(10, instance.incidents.get(0).offset);