Changeset 98 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder/gui/panels

Timestamp:

08/29/2017 10:40:27 AM (9 years ago)

Author:

bmcguffin

Message:

Added "Add 15 minutes" button, btnAddTime, to both Script Builder and Incident Editor windows. Clicking the button allows the user to add 15 minutes of scrollable space to the end of the timeline window, so that new events can be added after the end. This extra time does not interact with the model and so does not enter the save file, or persist between iterations of the program.

Location:

trunk/src/scriptbuilder/gui/panels

Files:

• IncidentTimelinePanel.java (modified) (3 diffs)
• TimeStampPanel.java (modified) (3 diffs)
• TimelineTickPanel.java (modified) (3 diffs)

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

@@ -62 +62 @@
 
     /**
+     * Filler time at the end of the screen for a particular incident
+     */
+    public int requestedEditorFillerTime;
+
+    /**
+     * Filler time at the end of the screen for the whole script
+     */
+    public static int requestedScriptBuilderFillerTime = 0;
+
+    /**
+     * Constant for amount of filler to add, in seconds. Set to 15 minutes
+     */
+    public static final int FILLER_INTERVAL_SECONDS = 900;
+
+    /**
      * The map representing the properties of this incident's events. Keys:
      * event types. Values: Properties objects for those events.
@@ -310 +325 @@
         super();
 
+        requestedEditorFillerTime = 0;
 //        FACILITATOR_EVAL_EVENT, RADIO_EVAL_EVENT
         eventTypeToPropertyMap = new HashMap();
@@ -352 +368 @@
         {
 
-            newSize = new Dimension(((incident.length + incident.offset)
-                    / ScriptBuilderGuiConstants.HORIZONTAL_TICK_RESOLUTION
-                    * ScriptBuilderGuiConstants.PIXEL_WIDTH_PER_HORIZONTAL_TICK)
-                    + ScriptBuilderGuiConstants.EVENT_ICON_WIDTH,
-                    ScriptBuilderGuiConstants.TIMELINE_COLLAPSED_HEIGHT
-                    + ScriptBuilderGuiConstants.SCRIPT_EVENT_ICON_STEP * 2);
+            if (getTopLevelAncestor() instanceof IncidentEditorFrame)
+            {
+
+                newSize = new Dimension(((incident.length + incident.offset + requestedEditorFillerTime)
+                        / ScriptBuilderGuiConstants.HORIZONTAL_TICK_RESOLUTION
+                        * ScriptBuilderGuiConstants.PIXEL_WIDTH_PER_HORIZONTAL_TICK)
+                        + ScriptBuilderGuiConstants.EVENT_ICON_WIDTH,
+                        ScriptBuilderGuiConstants.TIMELINE_COLLAPSED_HEIGHT
+                        + ScriptBuilderGuiConstants.SCRIPT_EVENT_ICON_STEP * 2);
+            }
+            else
+            {
+                newSize = new Dimension(((incident.length + incident.offset + requestedScriptBuilderFillerTime)
+                        / ScriptBuilderGuiConstants.HORIZONTAL_TICK_RESOLUTION
+                        * ScriptBuilderGuiConstants.PIXEL_WIDTH_PER_HORIZONTAL_TICK)
+                        + ScriptBuilderGuiConstants.EVENT_ICON_WIDTH,
+                        ScriptBuilderGuiConstants.TIMELINE_COLLAPSED_HEIGHT
+                        + ScriptBuilderGuiConstants.SCRIPT_EVENT_ICON_STEP * 2);
+            }
 
         }

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

@@ -61 +61 @@
                 if ((incident.length + incident.offset) > longestLength)
                 {
-                    longestLength = incident.length + incident.offset;
+                    longestLength = incident.length + incident.offset + IncidentTimelinePanel.requestedScriptBuilderFillerTime;
                 }
             }
@@ -92 +92 @@
      * @param incident the incident which this window is editing.
      */
-    public void update(ScriptIncident incident)
+    public void update(ScriptIncident incident, IncidentTimelinePanel timeline)
     {
         longestLength = ScriptBuilderGuiConstants.TICK_TIMELINE_SMALLEST_LENGTH;
@@ -105 +105 @@
             if ((incident.length + incident.offset) > longestLength)
             {
-                longestLength = incident.length + incident.offset;
+                longestLength = incident.length + incident.offset + timeline.requestedEditorFillerTime;
             }
         }

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

@@ -118 +118 @@
                 if ((incident.length + incident.offset) > longestLength)
                 {
-                    longestLength = incident.length + incident.offset;
+                    longestLength = incident.length + incident.offset + IncidentTimelinePanel.requestedScriptBuilderFillerTime;
                 }
             }
@@ -141 +141 @@
      * @param incident the incident being edited
      */
-    public void update(ScriptIncident incident)
+    public void update(ScriptIncident incident, IncidentTimelinePanel timeline)
     {
         longestLength = ScriptBuilderGuiConstants.TICK_TIMELINE_SMALLEST_LENGTH;
@@ -155 +155 @@
             if ((incident.length + incident.offset) > longestLength)
             {
-                longestLength = incident.length + incident.offset;
+                longestLength = incident.length + incident.offset + timeline.requestedEditorFillerTime;
             }