Index: trunk/src/scriptbuilder/gui/IncidentEditorFrame.java
===================================================================
--- trunk/src/scriptbuilder/gui/IncidentEditorFrame.java (revision 89)
+++ trunk/src/scriptbuilder/gui/IncidentEditorFrame.java (revision 98)
@@ -22,4 +22,5 @@
import javax.swing.DefaultListModel;
import javax.swing.JButton;
+import scriptbuilder.gui.panels.IncidentTimelinePanel;
import scriptbuilder.structures.ScriptEvent;
import scriptbuilder.structures.ScriptEvent.ScriptEventType;
@@ -310,6 +311,6 @@
theIncident = (ScriptIncident) arg;
- timelineTickPanel.update(theIncident);
- timeStampPanel.update(theIncident);
+ timelineTickPanel.update(theIncident, incidentTimelinePanel1);
+ timeStampPanel.update(theIncident, incidentTimelinePanel1);
incidentTimelinePanel1.timelinePanelUpdate(theIncident);
@@ -438,4 +439,5 @@
timeStampScrollPane = new javax.swing.JScrollPane();
timeStampPanel = new scriptbuilder.gui.panels.TimeStampPanel();
+ btnAddTime = new javax.swing.JButton();
cadEvent.setText("CAD Event");
@@ -1245,5 +1247,5 @@
timeStampPanelLayout.setHorizontalGroup(
timeStampPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 1032, Short.MAX_VALUE)
+ .addGap(0, 1036, Short.MAX_VALUE)
);
timeStampPanelLayout.setVerticalGroup(
@@ -1253,4 +1255,13 @@
timeStampScrollPane.setViewportView(timeStampPanel);
+
+ btnAddTime.setText("+15:00");
+ btnAddTime.addActionListener(new java.awt.event.ActionListener()
+ {
+ public void actionPerformed(java.awt.event.ActionEvent evt)
+ {
+ btnAddTimeActionPerformed(evt);
+ }
+ });
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
@@ -1261,10 +1272,4 @@
.addContainerGap()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(timelinesScrollPane, 0, 0, Short.MAX_VALUE)
- .addComponent(timeStampScrollPane)
- .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
- .addComponent(scriptEventsPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(scriptEventsPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addGroup(layout.createSequentialGroup()
.addComponent(selectButton, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE)
@@ -1275,7 +1280,19 @@
.addGap(18, 18, 18)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(zoomInIcon)
- .addComponent(zoomSlider, javax.swing.GroupLayout.PREFERRED_SIZE, 31, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(zoomOutIcon))))
+ .addGroup(layout.createSequentialGroup()
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(zoomInIcon)
+ .addComponent(zoomOutIcon))
+ .addGap(0, 0, Short.MAX_VALUE))
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(zoomSlider, javax.swing.GroupLayout.PREFERRED_SIZE, 31, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(btnAddTime, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
+ .addComponent(timelinesScrollPane, 0, 0, Short.MAX_VALUE)
+ .addComponent(timeStampScrollPane)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
+ .addComponent(scriptEventsPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(scriptEventsPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
.addContainerGap())
);
@@ -1295,6 +1312,11 @@
.addGap(20, 20, 20)
.addComponent(zoomInIcon)
- .addGap(1, 1, 1)
- .addComponent(zoomSlider, javax.swing.GroupLayout.PREFERRED_SIZE, 69, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addGap(1, 1, 1)
+ .addComponent(zoomSlider, javax.swing.GroupLayout.PREFERRED_SIZE, 69, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGroup(layout.createSequentialGroup()
+ .addGap(17, 17, 17)
+ .addComponent(btnAddTime, javax.swing.GroupLayout.PREFERRED_SIZE, 44, javax.swing.GroupLayout.PREFERRED_SIZE)))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(zoomOutIcon)))
@@ -1691,4 +1713,10 @@
zoomSlider.setValue(zoomSlider.getValue() <= 5 ? 5 : zoomSlider.getValue() - 1);
}//GEN-LAST:event_zoomOutIconMouseClicked
+
+ private void btnAddTimeActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_btnAddTimeActionPerformed
+ {//GEN-HEADEREND:event_btnAddTimeActionPerformed
+ incidentTimelinePanel1.requestedEditorFillerTime += IncidentTimelinePanel.FILLER_INTERVAL_SECONDS;
+ this.update(null, theIncident);
+ }//GEN-LAST:event_btnAddTimeActionPerformed
/**
@@ -1781,4 +1809,5 @@
private javax.swing.JButton atmsEvalButton;
private javax.swing.JButton audioButton;
+ private javax.swing.JButton btnAddTime;
private javax.swing.JButton cadButton;
private javax.swing.JButton cadEvalButton;
Index: trunk/src/scriptbuilder/gui/IncidentEditorFrame.form
===================================================================
--- trunk/src/scriptbuilder/gui/IncidentEditorFrame.form (revision 89)
+++ trunk/src/scriptbuilder/gui/IncidentEditorFrame.form (revision 98)
@@ -447,11 +447,4 @@
-
-
-
-
-
-
-
@@ -462,8 +455,24 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -490,6 +499,14 @@
-
-
+
+
+
+
+
+
+
+
+
+
@@ -1271,5 +1288,5 @@
-
+
@@ -1283,4 +1300,12 @@
+
+
+
+
+
+
+
+
Index: trunk/src/scriptbuilder/gui/panels/TimelineTickPanel.java
===================================================================
--- trunk/src/scriptbuilder/gui/panels/TimelineTickPanel.java (revision 76)
+++ trunk/src/scriptbuilder/gui/panels/TimelineTickPanel.java (revision 98)
@@ -118,5 +118,5 @@
if ((incident.length + incident.offset) > longestLength)
{
- longestLength = incident.length + incident.offset;
+ longestLength = incident.length + incident.offset + IncidentTimelinePanel.requestedScriptBuilderFillerTime;
}
}
@@ -141,5 +141,5 @@
* @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,5 +155,5 @@
if ((incident.length + incident.offset) > longestLength)
{
- longestLength = incident.length + incident.offset;
+ longestLength = incident.length + incident.offset + timeline.requestedEditorFillerTime;
}
Index: trunk/src/scriptbuilder/gui/panels/TimeStampPanel.java
===================================================================
--- trunk/src/scriptbuilder/gui/panels/TimeStampPanel.java (revision 76)
+++ trunk/src/scriptbuilder/gui/panels/TimeStampPanel.java (revision 98)
@@ -61,5 +61,5 @@
if ((incident.length + incident.offset) > longestLength)
{
- longestLength = incident.length + incident.offset;
+ longestLength = incident.length + incident.offset + IncidentTimelinePanel.requestedScriptBuilderFillerTime;
}
}
@@ -92,5 +92,5 @@
* @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,5 +105,5 @@
if ((incident.length + incident.offset) > longestLength)
{
- longestLength = incident.length + incident.offset;
+ longestLength = incident.length + incident.offset + timeline.requestedEditorFillerTime;
}
}
Index: trunk/src/scriptbuilder/gui/panels/IncidentTimelinePanel.java
===================================================================
--- trunk/src/scriptbuilder/gui/panels/IncidentTimelinePanel.java (revision 96)
+++ trunk/src/scriptbuilder/gui/panels/IncidentTimelinePanel.java (revision 98)
@@ -62,4 +62,19 @@
/**
+ * 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,4 +325,5 @@
super();
+ requestedEditorFillerTime = 0;
// FACILITATOR_EVAL_EVENT, RADIO_EVAL_EVENT
eventTypeToPropertyMap = new HashMap();
@@ -352,10 +368,23 @@
{
- 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);
+ }
}
Index: trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java
===================================================================
--- trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java (revision 95)
+++ trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java (revision 98)
@@ -25,4 +25,5 @@
import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
+import scriptbuilder.gui.panels.IncidentTimelinePanel;
import scriptbuilder.structures.ScriptEvent;
import scriptbuilder.structures.ScriptEvent.ScriptEventType;
@@ -333,4 +334,5 @@
timeStampScrollPane = new javax.swing.JScrollPane();
timeStampPanel = new scriptbuilder.gui.panels.TimeStampPanel();
+ btnAddTime = new javax.swing.JButton();
scriptBuilderMenuBar = new javax.swing.JMenuBar();
fileMenu = new javax.swing.JMenu();
@@ -1177,4 +1179,13 @@
timeStampScrollPane.setViewportView(timeStampPanel);
+ btnAddTime.setText("+15:00");
+ btnAddTime.addActionListener(new java.awt.event.ActionListener()
+ {
+ public void actionPerformed(java.awt.event.ActionEvent evt)
+ {
+ btnAddTimeActionPerformed(evt);
+ }
+ });
+
fileMenu.setText("File");
fileMenu.setMargin(new java.awt.Insets(0, 10, 0, 10));
@@ -1400,5 +1411,5 @@
.addComponent(timeStampScrollPane)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
- .addGap(0, 597, Short.MAX_VALUE)
+ .addGap(0, 604, Short.MAX_VALUE)
.addComponent(zoomOutIcon)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
@@ -1406,5 +1417,7 @@
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(zoomInIcon)
- .addGap(136, 136, 136)))
+ .addGap(18, 18, 18)
+ .addComponent(btnAddTime)
+ .addGap(21, 21, 21)))
.addContainerGap())
);
@@ -1416,5 +1429,6 @@
.addComponent(zoomOutIcon)
.addComponent(zoomSlider, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(zoomInIcon))
+ .addComponent(zoomInIcon)
+ .addComponent(btnAddTime))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(timeStampScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 20, javax.swing.GroupLayout.PREFERRED_SIZE)
@@ -2025,4 +2039,10 @@
}//GEN-LAST:event_deleteIncidentActionPerformed
+ private void btnAddTimeActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_btnAddTimeActionPerformed
+ {//GEN-HEADEREND:event_btnAddTimeActionPerformed
+ IncidentTimelinePanel.requestedScriptBuilderFillerTime += IncidentTimelinePanel.FILLER_INTERVAL_SECONDS;
+ this.update(script, script);
+ }//GEN-LAST:event_btnAddTimeActionPerformed
+
/**
* Read the version number from the application properties. The file
@@ -2116,4 +2136,5 @@
private javax.swing.JSpinner addIncidentStart;
private javax.swing.JFrame addNoiseFrame;
+ private javax.swing.JButton btnAddTime;
private javax.swing.JMenuItem cadEvent;
private javax.swing.JFrame cadEventFrame;
Index: trunk/src/scriptbuilder/gui/ScriptBuilderFrame.form
===================================================================
--- trunk/src/scriptbuilder/gui/ScriptBuilderFrame.form (revision 89)
+++ trunk/src/scriptbuilder/gui/ScriptBuilderFrame.form (revision 98)
@@ -905,5 +905,5 @@
-
+
@@ -911,5 +911,7 @@
-
+
+
+
@@ -926,4 +928,5 @@
+
@@ -1504,4 +1507,12 @@
+
+
+
+
+
+
+
+