Index: trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java =================================================================== --- trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java (revision 108) +++ trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java (revision 109) @@ -177,8 +177,10 @@ public void update(Observable o, Object arg) { + //Three major update types: whole script, and 2 event updates if (arg instanceof SimulationScript) { script = (SimulationScript) arg; + //If we don't have exactly 10 events something is wrong if (script.incidents.size() != 10) { @@ -186,7 +188,9 @@ } + //Call update on major panels timelineTickPanel.update(script); timeStampPanel.update(script); + //Call update on all timeline panels incidentTimelinePanel1.timelinePanelUpdate(script.incidents.get(0)); incidentTimelinePanel2.timelinePanelUpdate(script.incidents.get(1)); @@ -200,4 +204,5 @@ incidentTimelinePanel10.timelinePanelUpdate(script.incidents.get(9)); + //Cal update on number panels incidentNumberPanel1.update(script.incidents.get(0)); incidentNumberPanel2.update(script.incidents.get(1)); @@ -219,4 +224,5 @@ pack(); } + //Mouse has changed focus to a different timeslice else if (arg instanceof SliceChangedEvent) { @@ -229,4 +235,5 @@ } } + //Mouse has changed focus to a different incident timeline panel else if (arg instanceof IncidentFocusedEvent) { @@ -236,8 +243,13 @@ } + //Regardless of update type, refresh window by doing these things: + //Enable "+15:00" button if script is not empty btnAddTime.setEnabled(script != null && script.numberOfIncidents > 0); + //enable zoom slider if script is not empty zoomSlider.setEnabled(script != null && script.numberOfIncidents > 0); + //scale the zoom slider such that the most zoomed-out point allows the + //entire script to be visible at once zoomSlider.setMinimum(((timelineTickPanel.getVisibleRect().width - 20) * ScriptBuilderGuiConstants.HORIZONTAL_TICK_RESOLUTION) @@ -267,8 +279,8 @@ jMenuItem6 = new javax.swing.JMenuItem(); cadEventFrame = new javax.swing.JFrame(); - jLabel5 = new javax.swing.JLabel(); + labelCADEntry = new javax.swing.JLabel(); radioEventFrame = new javax.swing.JFrame(); - radioTypeLabel = new javax.swing.JLabel(); - jLabel7 = new javax.swing.JLabel(); + labelRadioType = new javax.swing.JLabel(); + labelRadioMessage = new javax.swing.JLabel(); radioTypeComboBox = new javax.swing.JComboBox(); radioMessageScrollPane = new javax.swing.JScrollPane(); @@ -280,9 +292,9 @@ deleteEventList = new javax.swing.JMenuItem(); incidentFrame = new javax.swing.JFrame(); - jLabel6 = new javax.swing.JLabel(); - jLabel8 = new javax.swing.JLabel(); - jLabel9 = new javax.swing.JLabel(); - jLabel10 = new javax.swing.JLabel(); - jScrollPane1 = new javax.swing.JScrollPane(); + labelIncidentNumber = new javax.swing.JLabel(); + labelIncidentName = new javax.swing.JLabel(); + labelIncidentColor = new javax.swing.JLabel(); + labelIncidentDescription = new javax.swing.JLabel(); + incidentPropertiesScrollPane = new javax.swing.JScrollPane(); addIncidentDescription = new javax.swing.JTextArea(); incidentOkButton = new javax.swing.JButton(); @@ -290,26 +302,26 @@ addIncidentNumber = new javax.swing.JSpinner(); addIncidentName = new javax.swing.JTextField(); - jLabel11 = new javax.swing.JLabel(); - jLabel12 = new javax.swing.JLabel(); + labelIncidentLength = new javax.swing.JLabel(); + labelIncidentStart = new javax.swing.JLabel(); addIncidentStart = new javax.swing.JSpinner(); - jButton3 = new javax.swing.JButton(); + btnChooseColor = new javax.swing.JButton(); incidentColorField = new javax.swing.JTextField(); - labelIncidentLength = new javax.swing.JLabel(); + txtIncidentLength = new javax.swing.JLabel(); addNoiseFrame = new javax.swing.JFrame(); - jLabel13 = new javax.swing.JLabel(); - jSlider1 = new javax.swing.JSlider(); - jSlider2 = new javax.swing.JSlider(); - jLabel14 = new javax.swing.JLabel(); - jSlider3 = new javax.swing.JSlider(); - jLabel15 = new javax.swing.JLabel(); - jTextArea1 = new javax.swing.JTextArea(); - jSlider4 = new javax.swing.JSlider(); - jLabel16 = new javax.swing.JLabel(); - jSlider5 = new javax.swing.JSlider(); - jLabel17 = new javax.swing.JLabel(); - jButton1 = new javax.swing.JButton(); - jButton2 = new javax.swing.JButton(); - jLabel20 = new javax.swing.JLabel(); - jLabel21 = new javax.swing.JLabel(); + labelRadioChatter = new javax.swing.JLabel(); + radioChatterSlider = new javax.swing.JSlider(); + laneClosuresSlider = new javax.swing.JSlider(); + labelLaneClosures = new javax.swing.JLabel(); + TMCALSlider = new javax.swing.JSlider(); + labelTMCALLogs = new javax.swing.JLabel(); + txtNoiseDescription = new javax.swing.JTextArea(); + backgroundNoiseSlider = new javax.swing.JSlider(); + labelBackgroundNoise = new javax.swing.JLabel(); + minorEventsSlider = new javax.swing.JSlider(); + labelMinorEvents = new javax.swing.JLabel(); + btnCancelNoise = new javax.swing.JButton(); + btnGenerateNoise = new javax.swing.JButton(); + labelLeastFreq = new javax.swing.JLabel(); + labelMostFreq = new javax.swing.JLabel(); incidentColorChooser = new javax.swing.JColorChooser(); timelinesScrollPane = new javax.swing.JScrollPane(); @@ -383,4 +395,11 @@ } }); + cadEvent.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { + cadEventActionPerformed(evt); + } + }); eventPopupMenu.add(cadEvent); @@ -409,5 +428,5 @@ cadEventFrame.setMinimumSize(new java.awt.Dimension(400, 300)); - jLabel5.setText("CAD Entry"); + labelCADEntry.setText("CAD Entry"); javax.swing.GroupLayout cadEventFrameLayout = new javax.swing.GroupLayout(cadEventFrame.getContentPane()); @@ -417,5 +436,5 @@ .addGroup(cadEventFrameLayout.createSequentialGroup() .addContainerGap() - .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, 68, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(labelCADEntry, javax.swing.GroupLayout.PREFERRED_SIZE, 68, javax.swing.GroupLayout.PREFERRED_SIZE) .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); @@ -424,5 +443,5 @@ .addGroup(cadEventFrameLayout.createSequentialGroup() .addContainerGap() - .addComponent(jLabel5) + .addComponent(labelCADEntry) .addContainerGap(1357, Short.MAX_VALUE)) ); @@ -431,7 +450,7 @@ radioEventFrame.setMinimumSize(new java.awt.Dimension(400, 300)); - radioTypeLabel.setText("Radio Type:"); - - jLabel7.setText("Radio Message:"); + labelRadioType.setText("Radio Type:"); + + labelRadioMessage.setText("Radio Message:"); radioTypeComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "TMT", "Maintanence" })); @@ -472,8 +491,8 @@ .addComponent(radioMessageScrollPane, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 380, Short.MAX_VALUE) .addGroup(javax.swing.GroupLayout.Alignment.LEADING, radioEventFrameLayout.createSequentialGroup() - .addComponent(radioTypeLabel) + .addComponent(labelRadioType) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(radioTypeComboBox, 0, 312, Short.MAX_VALUE)) - .addComponent(jLabel7, javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(labelRadioMessage, javax.swing.GroupLayout.Alignment.LEADING) .addGroup(javax.swing.GroupLayout.Alignment.LEADING, radioEventFrameLayout.createSequentialGroup() .addComponent(cancelButton) @@ -487,8 +506,8 @@ .addContainerGap() .addGroup(radioEventFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(radioTypeLabel) + .addComponent(labelRadioType) .addComponent(radioTypeComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(jLabel7) + .addComponent(labelRadioMessage) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(radioMessageScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 198, Short.MAX_VALUE) @@ -516,14 +535,14 @@ incidentFrame.setMinimumSize(new java.awt.Dimension(400, 400)); - jLabel6.setText("Incident Number: "); - - jLabel8.setText("Incident Name:"); - - jLabel9.setText("Incident Color: "); - - jLabel10.setText("Incident Description:"); - - jScrollPane1.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); - jScrollPane1.setVerticalScrollBarPolicy(javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS); + labelIncidentNumber.setText("Incident Number: "); + + labelIncidentName.setText("Incident Name:"); + + labelIncidentColor.setText("Incident Color: "); + + labelIncidentDescription.setText("Incident Description:"); + + incidentPropertiesScrollPane.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); + incidentPropertiesScrollPane.setVerticalScrollBarPolicy(javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS); addIncidentDescription.setColumns(20); @@ -531,5 +550,5 @@ addIncidentDescription.setRows(5); addIncidentDescription.setWrapStyleWord(true); - jScrollPane1.setViewportView(addIncidentDescription); + incidentPropertiesScrollPane.setViewportView(addIncidentDescription); incidentOkButton.setText("OK"); @@ -553,16 +572,16 @@ addIncidentNumber.setModel(new javax.swing.SpinnerNumberModel(Integer.valueOf(101), Integer.valueOf(101), null, Integer.valueOf(1))); - jLabel11.setText("Incident Length in Minutes: "); - - jLabel12.setText("Incident Start Time in Minutes:"); + labelIncidentLength.setText("Incident Length in Minutes: "); + + labelIncidentStart.setText("Incident Start Time in Minutes:"); addIncidentStart.setModel(new javax.swing.SpinnerNumberModel(Integer.valueOf(0), Integer.valueOf(0), null, Integer.valueOf(1))); - jButton3.setText("Choose..."); - jButton3.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - jButton3ActionPerformed(evt); + btnChooseColor.setText("Choose..."); + btnChooseColor.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { + btnChooseColorActionPerformed(evt); } }); @@ -571,7 +590,7 @@ incidentColorField.setBackground(new java.awt.Color(0, 0, 0)); - labelIncidentLength.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT); - labelIncidentLength.setText("0"); - labelIncidentLength.setToolTipText(""); + txtIncidentLength.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT); + txtIncidentLength.setText("0"); + txtIncidentLength.setToolTipText(""); javax.swing.GroupLayout incidentFrameLayout = new javax.swing.GroupLayout(incidentFrame.getContentPane()); @@ -582,11 +601,11 @@ .addContainerGap() .addGroup(incidentFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(jScrollPane1, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 322, Short.MAX_VALUE) - .addComponent(jLabel10, javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(incidentPropertiesScrollPane, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 322, Short.MAX_VALUE) + .addComponent(labelIncidentDescription, javax.swing.GroupLayout.Alignment.LEADING) .addGroup(javax.swing.GroupLayout.Alignment.LEADING, incidentFrameLayout.createSequentialGroup() .addGroup(incidentFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jLabel6) - .addComponent(jLabel8) - .addComponent(jLabel9)) + .addComponent(labelIncidentNumber) + .addComponent(labelIncidentName) + .addComponent(labelIncidentColor)) .addGap(18, 18, 18) .addGroup(incidentFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -596,5 +615,5 @@ .addComponent(incidentColorField, javax.swing.GroupLayout.DEFAULT_SIZE, 119, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jButton3, javax.swing.GroupLayout.PREFERRED_SIZE, 93, javax.swing.GroupLayout.PREFERRED_SIZE)))) + .addComponent(btnChooseColor, javax.swing.GroupLayout.PREFERRED_SIZE, 93, javax.swing.GroupLayout.PREFERRED_SIZE)))) .addGroup(javax.swing.GroupLayout.Alignment.LEADING, incidentFrameLayout.createSequentialGroup() .addComponent(incidentCancelButton) @@ -603,11 +622,11 @@ .addGroup(javax.swing.GroupLayout.Alignment.LEADING, incidentFrameLayout.createSequentialGroup() .addGroup(incidentFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jLabel12) - .addComponent(jLabel11)) + .addComponent(labelIncidentStart) + .addComponent(labelIncidentLength)) .addGap(18, 18, 18) .addGroup(incidentFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(incidentFrameLayout.createSequentialGroup() .addGap(6, 6, 6) - .addComponent(labelIncidentLength, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(txtIncidentLength, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGap(22, 22, 22)) .addComponent(addIncidentStart, javax.swing.GroupLayout.DEFAULT_SIZE, 158, Short.MAX_VALUE)))) @@ -619,27 +638,27 @@ .addContainerGap() .addGroup(incidentFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(jLabel6) + .addComponent(labelIncidentNumber) .addComponent(addIncidentNumber, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(incidentFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(jLabel8) + .addComponent(labelIncidentName) .addComponent(addIncidentName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(incidentFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(jLabel9) - .addComponent(jButton3) + .addComponent(labelIncidentColor) + .addComponent(btnChooseColor) .addComponent(incidentColorField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jLabel10) + .addComponent(labelIncidentDescription) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 118, Short.MAX_VALUE) + .addComponent(incidentPropertiesScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 118, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(incidentFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(addIncidentStart, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel12)) + .addComponent(labelIncidentStart)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(incidentFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(jLabel11) - .addComponent(labelIncidentLength)) + .addComponent(labelIncidentLength) + .addComponent(txtIncidentLength)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(incidentFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) @@ -653,53 +672,53 @@ addNoiseFrame.setResizable(false); - jLabel13.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N - jLabel13.setText("Radio Chatter: "); - - jLabel14.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N - jLabel14.setText("Lane Closures:"); - - jLabel15.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N - jLabel15.setText("TMCAL Logs:"); - - jTextArea1.setEditable(false); - jTextArea1.setColumns(20); - jTextArea1.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N - jTextArea1.setLineWrap(true); - jTextArea1.setRows(5); - jTextArea1.setText("Noise events will be randomly generated for the simulation with frequencies based on the control selections made below"); - jTextArea1.setWrapStyleWord(true); - jTextArea1.setAutoscrolls(false); - jTextArea1.setBorder(null); - jTextArea1.setDisabledTextColor(new java.awt.Color(0, 0, 0)); - jTextArea1.setFocusable(false); - jTextArea1.setOpaque(false); - - jLabel16.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N - jLabel16.setText("Background Noise: "); - - jLabel17.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N - jLabel17.setText("Minor Events:"); - - jButton1.setText("Cancel"); - jButton1.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - jButton1ActionPerformed(evt); - } - }); - - jButton2.setText("Generate"); - jButton2.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - jButton2ActionPerformed(evt); - } - }); - - jLabel20.setText("Least Frequent"); - - jLabel21.setText("Most Frequent"); + labelRadioChatter.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N + labelRadioChatter.setText("Radio Chatter: "); + + labelLaneClosures.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N + labelLaneClosures.setText("Lane Closures:"); + + labelTMCALLogs.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N + labelTMCALLogs.setText("TMCAL Logs:"); + + txtNoiseDescription.setEditable(false); + txtNoiseDescription.setColumns(20); + txtNoiseDescription.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N + txtNoiseDescription.setLineWrap(true); + txtNoiseDescription.setRows(5); + txtNoiseDescription.setText("Noise events will be randomly generated for the simulation with frequencies based on the control selections made below"); + txtNoiseDescription.setWrapStyleWord(true); + txtNoiseDescription.setAutoscrolls(false); + txtNoiseDescription.setBorder(null); + txtNoiseDescription.setDisabledTextColor(new java.awt.Color(0, 0, 0)); + txtNoiseDescription.setFocusable(false); + txtNoiseDescription.setOpaque(false); + + labelBackgroundNoise.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N + labelBackgroundNoise.setText("Background Noise: "); + + labelMinorEvents.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N + labelMinorEvents.setText("Minor Events:"); + + btnCancelNoise.setText("Cancel"); + btnCancelNoise.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { + btnCancelNoiseActionPerformed(evt); + } + }); + + btnGenerateNoise.setText("Generate"); + btnGenerateNoise.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { + btnGenerateNoiseActionPerformed(evt); + } + }); + + labelLeastFreq.setText("Least Frequent"); + + labelMostFreq.setText("Most Frequent"); javax.swing.GroupLayout addNoiseFrameLayout = new javax.swing.GroupLayout(addNoiseFrame.getContentPane()); @@ -710,29 +729,29 @@ .addContainerGap(21, Short.MAX_VALUE) .addGroup(addNoiseFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(jTextArea1, javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(txtNoiseDescription, javax.swing.GroupLayout.Alignment.LEADING) .addGroup(addNoiseFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) .addGroup(javax.swing.GroupLayout.Alignment.LEADING, addNoiseFrameLayout.createSequentialGroup() - .addComponent(jButton1) + .addComponent(btnCancelNoise) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(jButton2)) + .addComponent(btnGenerateNoise)) .addGroup(javax.swing.GroupLayout.Alignment.LEADING, addNoiseFrameLayout.createSequentialGroup() .addGroup(addNoiseFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(addNoiseFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(jLabel16) - .addComponent(jLabel14, javax.swing.GroupLayout.PREFERRED_SIZE, 105, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel15, javax.swing.GroupLayout.PREFERRED_SIZE, 105, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel13, javax.swing.GroupLayout.PREFERRED_SIZE, 105, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addComponent(jLabel17, javax.swing.GroupLayout.PREFERRED_SIZE, 81, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(labelBackgroundNoise) + .addComponent(labelLaneClosures, javax.swing.GroupLayout.PREFERRED_SIZE, 105, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(labelTMCALLogs, javax.swing.GroupLayout.PREFERRED_SIZE, 105, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(labelRadioChatter, javax.swing.GroupLayout.PREFERRED_SIZE, 105, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(labelMinorEvents, javax.swing.GroupLayout.PREFERRED_SIZE, 81, javax.swing.GroupLayout.PREFERRED_SIZE)) .addGap(4, 4, 4) .addGroup(addNoiseFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(jSlider1, javax.swing.GroupLayout.PREFERRED_SIZE, 245, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jSlider2, javax.swing.GroupLayout.PREFERRED_SIZE, 245, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jSlider3, javax.swing.GroupLayout.PREFERRED_SIZE, 245, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jSlider5, javax.swing.GroupLayout.PREFERRED_SIZE, 245, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jSlider4, javax.swing.GroupLayout.PREFERRED_SIZE, 245, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(radioChatterSlider, javax.swing.GroupLayout.PREFERRED_SIZE, 245, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(laneClosuresSlider, javax.swing.GroupLayout.PREFERRED_SIZE, 245, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(TMCALSlider, javax.swing.GroupLayout.PREFERRED_SIZE, 245, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(minorEventsSlider, javax.swing.GroupLayout.PREFERRED_SIZE, 245, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(backgroundNoiseSlider, javax.swing.GroupLayout.PREFERRED_SIZE, 245, javax.swing.GroupLayout.PREFERRED_SIZE) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, addNoiseFrameLayout.createSequentialGroup() - .addComponent(jLabel20) + .addComponent(labelLeastFreq) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(jLabel21)))))) + .addComponent(labelMostFreq)))))) .addGap(20, 20, 20)) ); @@ -741,33 +760,33 @@ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, addNoiseFrameLayout.createSequentialGroup() .addContainerGap() - .addComponent(jTextArea1, javax.swing.GroupLayout.DEFAULT_SIZE, 39, Short.MAX_VALUE) + .addComponent(txtNoiseDescription, javax.swing.GroupLayout.DEFAULT_SIZE, 39, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(addNoiseFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(jLabel21) - .addComponent(jLabel20)) + .addComponent(labelMostFreq) + .addComponent(labelLeastFreq)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(addNoiseFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(jLabel13, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jSlider1, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(labelRadioChatter, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(radioChatterSlider, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(addNoiseFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(jLabel14, javax.swing.GroupLayout.PREFERRED_SIZE, 28, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jSlider2, javax.swing.GroupLayout.PREFERRED_SIZE, 28, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(labelLaneClosures, javax.swing.GroupLayout.PREFERRED_SIZE, 28, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(laneClosuresSlider, javax.swing.GroupLayout.PREFERRED_SIZE, 28, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(addNoiseFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) - .addComponent(jLabel15) - .addComponent(jSlider3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(labelTMCALLogs) + .addComponent(TMCALSlider, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(addNoiseFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(jSlider4, javax.swing.GroupLayout.PREFERRED_SIZE, 29, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel16, javax.swing.GroupLayout.PREFERRED_SIZE, 29, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(backgroundNoiseSlider, javax.swing.GroupLayout.PREFERRED_SIZE, 29, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(labelBackgroundNoise, javax.swing.GroupLayout.PREFERRED_SIZE, 29, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(addNoiseFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jSlider5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel17)) + .addComponent(minorEventsSlider, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(labelMinorEvents)) .addGap(18, 18, 18) .addGroup(addNoiseFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jButton1) - .addComponent(jButton2)) + .addComponent(btnCancelNoise) + .addComponent(btnGenerateNoise)) .addContainerGap()) ); @@ -1436,4 +1455,5 @@ */ private void zoomSliderStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_zoomSliderStateChanged + //Changing the zoom level always refreshes the window ScriptBuilderGuiConstants.PIXEL_WIDTH_PER_HORIZONTAL_TICK = zoomSlider.getValue(); this.update(script, script); @@ -1519,5 +1539,4 @@ (Integer) addIncidentNumber.getValue(), addIncidentName.getText(), addIncidentDescription.getText(), script)); -// script.incidents.get(indx).length = (Integer) addIncidentLength.getValue() * 60; script.incidents.get(indx).setOffset((Integer) addIncidentStart.getValue() * 60); script.numberOfIncidents++; @@ -1526,34 +1545,4 @@ else//editing existing incident { -// //what the hell? -// ScriptIncident backup = script.incidents.get(oldIncidentIndex); -// script.incidents.remove(oldIncidentIndex); -// script.incidents.add(oldIncidentIndex, null); -// -// for (ScriptIncident i : script.incidents) -// { -// if (i != null && i.number == (Integer) addIncidentNumber.getValue()) -// { -// script.incidents.remove(oldIncidentIndex); -// script.incidents.add(oldIncidentIndex, backup); -// JOptionPane.showMessageDialog(this, "Incident number already in use.", -// "Unable to Create Incident", JOptionPane.ERROR_MESSAGE); -// incidentFrame.setVisible(true); -// return; -// } -// } -// -// //ugh why do it like this -// script.incidents.remove(oldIncidentIndex); -// SimulationScript.incidentColors[oldIncidentIndex] = selectedColor; -// script.incidents.add(oldIncidentIndex, -// new ScriptIncident(SimulationScript.incidentColors[oldIncidentIndex], -// (Integer) addIncidentNumber.getValue(), addIncidentName.getText(), addIncidentDescription.getText(), -// script)); -// script.incidents.get(oldIncidentIndex).length = (Integer) addIncidentLength.getValue() * 60; -// script.incidents.get(oldIncidentIndex).slices = backup.slices; -// script.incidents.get(oldIncidentIndex).offset = backup.offset; -// script.incidents.get(oldIncidentIndex).setOffset((Integer) addIncidentStart.getValue() * 60); - //adjust incident color script.incidents.get(oldIncidentIndex).color = selectedColor; @@ -1570,5 +1559,6 @@ script.incidents.get(oldIncidentIndex).number = (int) addIncidentNumber.getValue(); } - else + else//if the updated value conflicts with an existing inc number, + //the inc number update fails { JOptionPane.showMessageDialog(this, "Incident number already in use.", @@ -1577,4 +1567,5 @@ } + //close this frame incidentFrame.setVisible(false); this.update(script, script); @@ -1582,4 +1573,12 @@ }//GEN-LAST:event_incidentOkButtonActionPerformed + /** + * Determine if the given incident number is already present in the script. + * + * @param script the current simulation script + * @param num the incident log number to check + * @return true if one of the existing incidents in the script uses that log + * number + */ private boolean scriptContainsLogNum(SimulationScript script, int num) { @@ -1615,5 +1614,5 @@ addIncidentNumber.setValue(101); addIncidentStart.setValue(0); - labelIncidentLength.setText("0"); + txtIncidentLength.setText("0"); incidentColorField.setBackground(Color.BLACK); selectedColor = Color.BLACK; @@ -1635,4 +1634,5 @@ JFileChooser fc = new JFileChooser(); + //Search for .xml files fc.setFileFilter(new ExtensionFileFilter("Simulation Script XML (.xml)", new String[] @@ -1642,10 +1642,11 @@ if (fc.showOpenDialog(this) == JFileChooser.APPROVE_OPTION) { + //make a new script and load it with values from the selected file script = new SimulationScript(); - System.out.println(fc.getSelectedFile().getName()); script.loadScriptFromFile(fc.getSelectedFile()); script.saveFile = fc.getSelectedFile(); } this.update(script, script); + //zoom out all the way so that the whole imported script is visible zoomSlider.setValue(zoomSlider.getMinimum()); repaint(); @@ -1681,8 +1682,11 @@ */ private void fileSaveActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_fileSaveActionPerformed + //If the script has never been saved before, we need to name or create a + //file in which to save it if (script.saveFile == null) { fileSaveAsActionPerformed(evt); } + //Otherwise, just save to the previously selected save spot else { @@ -1691,4 +1695,8 @@ }//GEN-LAST:event_fileSaveActionPerformed + /** + * Allow this window to refresh itself, after a different window loses + * focus. + */ public void returnFocus() { @@ -1697,4 +1705,10 @@ } + /** + * Set up the incident details/properties window so that it reflects the + * values of the selected incident. Then, make the window visible. + * + * @param i the incident to be represented by this details window + */ public void incidentDetailsScreen(ScriptIncident i) { @@ -1705,6 +1719,6 @@ addIncidentNumber.setValue(i.number); addIncidentStart.setValue(i.offset / 60); - labelIncidentLength.setText(""+(i.length/60) ); - labelIncidentLength.setHorizontalTextPosition(SwingConstants.RIGHT); + txtIncidentLength.setText("" + (i.length / 60)); + txtIncidentLength.setHorizontalTextPosition(SwingConstants.RIGHT); //addIncidentLength.setValue(i.length / 60); incidentColorField.setBackground(i.color); @@ -1730,20 +1744,20 @@ * @param evt the button press event */ - private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed + private void btnCancelNoiseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnCancelNoiseActionPerformed addNoiseFrame.setVisible(false); - }//GEN-LAST:event_jButton1ActionPerformed - - /** - * Generates random noise upon click of the "OK" button, then hides the - * noise generation screen. + }//GEN-LAST:event_btnCancelNoiseActionPerformed + + /** + * Generates random noise upon click of the "Generate" button, then hides + * the noise generation screen. * * @param evt the button press event */ - private void jButton2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton2ActionPerformed + private void btnGenerateNoiseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnGenerateNoiseActionPerformed Random rng = new Random(); ScriptEventType[] eventTypes = ScriptEventType.values(); /* For prototyping purpose, ignore the sliders and average their values */ - int total = jSlider1.getValue() + jSlider2.getValue() + jSlider3.getValue() + jSlider5.getValue() + jSlider4.getValue(); + int total = radioChatterSlider.getValue() + laneClosuresSlider.getValue() + TMCALSlider.getValue() + minorEventsSlider.getValue() + backgroundNoiseSlider.getValue(); total /= 5; @@ -1778,5 +1792,5 @@ this.update(script, script); repaint(); -}//GEN-LAST:event_jButton2ActionPerformed +}//GEN-LAST:event_btnGenerateNoiseActionPerformed /** @@ -1790,4 +1804,6 @@ String input = ""; ScriptIncident inc = null; + + //Pick the incident to save Object result = JOptionPane.showInputDialog( this, @@ -1798,11 +1814,5 @@ incidentList, script.incidents.get(0)); - - System.out.println("RESULT = " + result.toString()); - input = result.toString(); - - System.out.println("INPUT = " + input); - int i = 0; for (ScriptIncident incident : script.incidents) @@ -1812,5 +1822,4 @@ continue; } - System.out.println((++i) + ": " + incident.toString()); if (incident.toString().equals(input)) { @@ -1821,8 +1830,8 @@ if (inc == null) { - System.out.println("DIDN'T FIND ANYTHING"); return; } + //Pick the file to save it to JFileChooser fc = new JFileChooser(); fc.setFileFilter(new ExtensionFileFilter("Script Incident (.xml)", new String[] @@ -1836,4 +1845,9 @@ }//GEN-LAST:event_saveIncidentActionPerformed + /** + * Bring up the incident palette for loading of new incidents. + * + * @param evt the menu click event + */ private void loadIncidentActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_loadIncidentActionPerformed new IncidentPaletteFrame(script, this).setVisible(true); @@ -1841,4 +1855,5 @@ }//GEN-LAST:event_loadIncidentActionPerformed + //Unsupported as of 2017/09/05 private void generateProjectRequirementsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_generateProjectRequirementsActionPerformed JFileChooser fc = new JFileChooser(); @@ -1851,4 +1866,5 @@ }//GEN-LAST:event_generateProjectRequirementsActionPerformed + //Unsupported as of 2017/09/05 private void generateNotebooksActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_generateNotebooksActionPerformed JFileChooser fc = new JFileChooser(); @@ -1861,4 +1877,5 @@ }//GEN-LAST:event_generateNotebooksActionPerformed + //Unsupported as of 2017/09/05 private void generateScorecardsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_generateScorecardsActionPerformed JFileChooser fc = new JFileChooser(); @@ -1871,4 +1888,5 @@ }//GEN-LAST:event_generateScorecardsActionPerformed + //Unsupported as of 2017/09/05 private void generateOrganizationChartActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_generateOrganizationChartActionPerformed JFileChooser fc = new JFileChooser(); @@ -1906,14 +1924,16 @@ private Color selectedColor = Color.BLACK; - private void jButton3ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton3ActionPerformed + private void btnChooseColorActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnChooseColorActionPerformed + //For whatever reason, this causes the incident properties frame to be hidden Color newColor = incidentColorChooser.showDialog(this, "Incident Color", incidentColorField.getBackground()); if (newColor != null) { - System.out.println("New color is " + newColor.toString()); + //If the user selected a color, apply it to the properties frame selectedColor = newColor; incidentColorField.setBackground(newColor); } + //Return focus to the properties frame incidentFrame.setVisible(true); - }//GEN-LAST:event_jButton3ActionPerformed + }//GEN-LAST:event_btnChooseColorActionPerformed /* Help > About simply displays the current SVN revision number so @@ -1926,4 +1946,9 @@ }//GEN-LAST:event_helpAboutActionPerformed + /** + * Replaces the current script with a new, blank script. + * + * @param evt the menu selection event + */ private void fileNewActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_fileNewActionPerformed {//GEN-HEADEREND:event_fileNewActionPerformed @@ -1934,4 +1959,9 @@ }//GEN-LAST:event_fileNewActionPerformed + /** + * Allows the user to delete an incident from the current script. + * + * @param evt the menu selection event + */ private void deleteIncidentActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_deleteIncidentActionPerformed {//GEN-HEADEREND:event_deleteIncidentActionPerformed @@ -1939,4 +1969,5 @@ String input = ""; ScriptIncident inc = null; + //Choose the incident to be deleted Object result = JOptionPane.showInputDialog( this, @@ -1951,8 +1982,6 @@ { input = result.toString(); - int incidentIndex = 0; for (ScriptIncident incident : script.incidents) { - incidentIndex++; if (incident == null) { @@ -1965,4 +1994,5 @@ } + //Allow user to verify deletion before proceeding if (inc != null) { @@ -1971,4 +2001,5 @@ if (confirm == JOptionPane.YES_OPTION) { + //Remove the incident and replace it with a null placeholder script.incidents.remove(inc); script.incidents.add(null); @@ -1977,8 +2008,13 @@ } } + //Refresh this.update(script, script); repaint(); }//GEN-LAST:event_deleteIncidentActionPerformed - + /** + * Add 15 minutes to the end of the visible timeline. + * + * @param evt the button press event. + */ private void btnAddTimeActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_btnAddTimeActionPerformed {//GEN-HEADEREND:event_btnAddTimeActionPerformed @@ -1986,4 +2022,9 @@ this.update(script, script); }//GEN-LAST:event_btnAddTimeActionPerformed + + private void cadEventActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_cadEventActionPerformed + {//GEN-HEADEREND:event_cadEventActionPerformed + // TODO add your handling code here: + }//GEN-LAST:event_cadEventActionPerformed /** @@ -2022,5 +2063,5 @@ /** - * Runs the script builder. + * Runs the script builder. This is the main method for the whole program. * * @param args the command line arguments @@ -2032,15 +2073,7 @@ UIManager.setLookAndFeel("com.sun.java.swing.plaf.gtk.GTKLookAndFeel"); } - catch (ClassNotFoundException ex) - { - } - catch (InstantiationException ex) - { - } - catch (IllegalAccessException ex) - { - } - catch (UnsupportedLookAndFeelException ex) - { + catch (Exception ex) + { + //Apparently we don't do any special exception processing } @@ -2049,15 +2082,7 @@ UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel"); } - catch (ClassNotFoundException ex) - { - } - catch (InstantiationException ex) - { - } - catch (IllegalAccessException ex) - { - } - catch (UnsupportedLookAndFeelException ex) - { + catch (Exception ex) + { + //Apparently we don't do any special exception processing } @@ -2072,4 +2097,5 @@ } // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.JSlider TMCALSlider; private javax.swing.JTextArea addIncidentDescription; private javax.swing.JTextField addIncidentName; @@ -2077,5 +2103,9 @@ private javax.swing.JSpinner addIncidentStart; private javax.swing.JFrame addNoiseFrame; + private javax.swing.JSlider backgroundNoiseSlider; private javax.swing.JButton btnAddTime; + private javax.swing.JButton btnCancelNoise; + private javax.swing.JButton btnChooseColor; + private javax.swing.JButton btnGenerateNoise; private javax.swing.JMenuItem cadEvent; private javax.swing.JFrame cadEventFrame; @@ -2118,4 +2148,5 @@ private javax.swing.JButton incidentOkButton; private javax.swing.JPopupMenu incidentPopupMenu; + private javax.swing.JScrollPane incidentPropertiesScrollPane; private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel1; private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel10; @@ -2128,22 +2159,4 @@ private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel8; private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel9; - private javax.swing.JButton jButton1; - private javax.swing.JButton jButton2; - private javax.swing.JButton jButton3; - private javax.swing.JLabel jLabel10; - private javax.swing.JLabel jLabel11; - private javax.swing.JLabel jLabel12; - private javax.swing.JLabel jLabel13; - private javax.swing.JLabel jLabel14; - private javax.swing.JLabel jLabel15; - private javax.swing.JLabel jLabel16; - private javax.swing.JLabel jLabel17; - private javax.swing.JLabel jLabel20; - private javax.swing.JLabel jLabel21; - private javax.swing.JLabel jLabel5; - private javax.swing.JLabel jLabel6; - private javax.swing.JLabel jLabel7; - private javax.swing.JLabel jLabel8; - private javax.swing.JLabel jLabel9; private javax.swing.JMenuItem jMenuItem2; private javax.swing.JMenuItem jMenuItem3; @@ -2151,20 +2164,31 @@ private javax.swing.JMenuItem jMenuItem5; private javax.swing.JMenuItem jMenuItem6; - private javax.swing.JScrollPane jScrollPane1; private javax.swing.JPopupMenu.Separator jSeparator1; private javax.swing.JPopupMenu.Separator jSeparator2; private javax.swing.JPopupMenu.Separator jSeparator3; private javax.swing.JPopupMenu.Separator jSeparator4; - private javax.swing.JSlider jSlider1; - private javax.swing.JSlider jSlider2; - private javax.swing.JSlider jSlider3; - private javax.swing.JSlider jSlider4; - private javax.swing.JSlider jSlider5; - private javax.swing.JTextArea jTextArea1; + private javax.swing.JLabel labelBackgroundNoise; + private javax.swing.JLabel labelCADEntry; + private javax.swing.JLabel labelIncidentColor; + private javax.swing.JLabel labelIncidentDescription; private javax.swing.JLabel labelIncidentLength; + private javax.swing.JLabel labelIncidentName; + private javax.swing.JLabel labelIncidentNumber; + private javax.swing.JLabel labelIncidentStart; + private javax.swing.JLabel labelLaneClosures; + private javax.swing.JLabel labelLeastFreq; + private javax.swing.JLabel labelMinorEvents; + private javax.swing.JLabel labelMostFreq; + private javax.swing.JLabel labelRadioChatter; + private javax.swing.JLabel labelRadioMessage; + private javax.swing.JLabel labelRadioType; + private javax.swing.JLabel labelTMCALLogs; + private javax.swing.JSlider laneClosuresSlider; private javax.swing.JMenuItem loadIncident; + private javax.swing.JSlider minorEventsSlider; private javax.swing.JMenuItem newIncident; private javax.swing.JButton okButton; private javax.swing.JMenuItem popupDeleteIncident; + private javax.swing.JSlider radioChatterSlider; private javax.swing.JMenuItem radioEvent; private javax.swing.JFrame radioEventFrame; @@ -2172,5 +2196,4 @@ private javax.swing.JScrollPane radioMessageScrollPane; private javax.swing.JComboBox radioTypeComboBox; - private javax.swing.JLabel radioTypeLabel; private javax.swing.JMenuItem saveIncident; private javax.swing.JMenuBar scriptBuilderMenuBar; @@ -2179,4 +2202,6 @@ private scriptbuilder.gui.panels.TimelineTickPanel timelineTickPanel; private javax.swing.JScrollPane timelinesScrollPane; + private javax.swing.JLabel txtIncidentLength; + private javax.swing.JTextArea txtNoiseDescription; private javax.swing.JLabel zoomInIcon; private javax.swing.JLabel zoomOutIcon; Index: trunk/src/scriptbuilder/gui/ScriptBuilderFrame.form =================================================================== --- trunk/src/scriptbuilder/gui/ScriptBuilderFrame.form (revision 108) +++ trunk/src/scriptbuilder/gui/ScriptBuilderFrame.form (revision 109) @@ -29,4 +29,5 @@ + @@ -73,5 +74,5 @@ - + @@ -82,5 +83,5 @@ - + @@ -89,5 +90,5 @@ - + @@ -112,9 +113,9 @@ - + - + @@ -132,9 +133,9 @@ - + - + @@ -150,10 +151,10 @@ - + - + @@ -243,11 +244,11 @@ - - + + - - - + + + @@ -258,5 +259,5 @@ - + @@ -269,6 +270,6 @@ - - + + @@ -276,5 +277,5 @@ - + @@ -292,31 +293,31 @@ - + - + - - + + - - - + + + - + - + @@ -331,25 +332,25 @@ - + - + - + - + - + @@ -397,10 +398,10 @@ - + - + @@ -414,10 +415,10 @@ - + - + @@ -430,5 +431,5 @@ - + @@ -454,32 +455,32 @@ - + - + - + - - - - + + + + - + - - - - - + + + + + - + - + @@ -495,39 +496,39 @@ - + - - + + - - + + - - + + - - + + - - - - - - - + + + + + + + - - + + @@ -537,5 +538,5 @@ - + @@ -545,9 +546,9 @@ - - - - - + + + + + @@ -557,7 +558,7 @@ - - - + + + @@ -567,5 +568,5 @@ - + @@ -589,7 +590,7 @@ - - - + + + @@ -599,7 +600,7 @@ - - - + + + @@ -609,26 +610,26 @@ - + - + - + - + - + - +