Changeset 106 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder

Timestamp:

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

Author:

bmcguffin

Message:

Fixed a bug which prevented the length of an incident from being properly preserved whenever the offset of the incident was changed.

Location:

trunk/src/scriptbuilder

Files:

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

trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java

@@ -1453 +1453 @@
                             (Integer) addIncidentNumber.getValue(), addIncidentName.getText(), addIncidentDescription.getText(),
                             script));
-            script.incidents.get(indx).length = (Integer) addIncidentLength.getValue() * 60;
+//            script.incidents.get(indx).length = (Integer) addIncidentLength.getValue() * 60;
             script.incidents.get(indx).setOffset((Integer) addIncidentStart.getValue() * 60);
             script.numberOfIncidents++;
@@ -1490 +1490 @@
 //            script.incidents.get(oldIncidentIndex).setOffset((Integer) addIncidentStart.getValue() * 60);
 
+            //adjust incident color
             script.incidents.get(oldIncidentIndex).color = selectedColor;
+            //adjust incident name
             script.incidents.get(oldIncidentIndex).name = addIncidentName.getText();
+            //adjust incident description
             script.incidents.get(oldIncidentIndex).description = addIncidentDescription.getText();
+            //change offset of incident
             script.incidents.get(oldIncidentIndex).setOffset(((int) addIncidentStart.getValue()) * 60);
+            //update incident number, if it was changed
             if ((int) addIncidentNumber.getValue() == script.incidents.get(oldIncidentIndex).number
                     || !scriptContainsLogNum(script, (int) addIncidentNumber.getValue()))
@@ -1544 +1549 @@
         addIncidentNumber.setValue(101);
         addIncidentStart.setValue(0);
-        addIncidentLength.setValue(0);
+        //addIncidentLength.setValue(0);
         incidentColorField.setBackground(Color.BLACK);
         selectedColor = Color.BLACK;
@@ -1625 +1630 @@
         zoomSliderStateChanged(new ChangeEvent(script));
     }
-    
+
     public void incidentDetailsScreen(ScriptIncident i)
     {
@@ -1634 +1639 @@
         addIncidentNumber.setValue(i.number);
         addIncidentStart.setValue(i.offset / 60);
-        addIncidentLength.setValue(i.length / 60);
+        //addIncidentLength.setValue(i.length / 60);
         incidentColorField.setBackground(i.color);
         selectedColor = i.color;

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

@@ -356 +356 @@
     {
         this.incident = incident;
-        this.visible = incident != null;
+        this.visible = (incident != null);
 
         Dimension newSize;

trunk/src/scriptbuilder/structures/ScriptIncident.java

@@ -159 +159 @@
         TreeMap<Integer, TimeSlice> newSlices = new TreeMap<Integer, TimeSlice>();
         
+        int latest = 0;
+        
         for(Integer k : slices.keySet())
         {
             newSlices.put(k + (offset - old), slices.get(k));
-        }
-
-        for (TimeSlice ts : slices.values())
+            latest = k + (offset - old);
+        }
+        
+        latestStart = latest;
+
+        for (TimeSlice ts : newSlices.values())
         {
             ts.shift(offset - old);
@@ -170 +175 @@
         
         slices = newSlices;
-
+        updateLength();
         script.update();
     }