Index: trunk/src/scriptbuilder/gui/IncidentEditorFrame.java =================================================================== --- trunk/src/scriptbuilder/gui/IncidentEditorFrame.java (revision 107) +++ trunk/src/scriptbuilder/gui/IncidentEditorFrame.java (revision 110) @@ -336,8 +336,11 @@ public void update(Observable o, Object arg) { + //Three possibilities: This is a general script update, or it's one of + //two different focus updates if (arg instanceof ScriptIncident) { theIncident = (ScriptIncident) arg; + //Update the appropriate panels timelineTickPanel.update(theIncident, incidentTimelinePanel1); timeStampPanel.update(theIncident, incidentTimelinePanel1); @@ -355,8 +358,10 @@ pack(); } + //A new timeslice has gained focus else if (arg instanceof SliceChangedEvent) { TimeSlice slice = ((SliceChangedEvent) arg).slice; + //Put the relevant slice's events into a list DefaultListModel model = new DefaultListModel(); for (I_ScriptEvent e : slice.events) @@ -366,8 +371,11 @@ scriptEventsList.setModel(model); } + //A new incident has gained focus + //This really should only be called upon instantiaton of the window else if (arg instanceof IncidentFocusedEvent) { ScriptIncident i = ((IncidentFocusedEvent) arg).incident; + //Put the incident's data in the incident description area incidentNumber.setText(Integer.toString(i.number)); incidentName.setText(i.name); @@ -376,4 +384,9 @@ //gotoIncident.setSelectedItem(i); } + + //Regardless of update type, do these things to refresh the window + + //Resize the zoom slider scale so that the most zoomed-out state displays + //the entire incident on the window zoomSlider.setMinimum(((timelineTickPanel.getVisibleRect().width - 20) * ScriptBuilderGuiConstants.HORIZONTAL_TICK_RESOLUTION) @@ -389,5 +402,6 @@ @SuppressWarnings("unchecked") // //GEN-BEGIN:initComponents - private void initComponents() { + private void initComponents() + { eventPopupMenu = new javax.swing.JPopupMenu(); @@ -412,19 +426,19 @@ deleteEventList = new javax.swing.JMenuItem(); 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(); + sliderRadioChatter = new javax.swing.JSlider(); + sliderLaneClosures = new javax.swing.JSlider(); + labelLaneClosures = new javax.swing.JLabel(); + sliderTMCAL = new javax.swing.JSlider(); + labelTMCAL = new javax.swing.JLabel(); + labelNoiseDescription = new javax.swing.JTextArea(); + sliderBackgroundNoise = new javax.swing.JSlider(); + labelBackgroundNoise = new javax.swing.JLabel(); + sliderMinorEvents = 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(); timelinesScrollPane = new javax.swing.JScrollPane(); timelineTickPanel = new scriptbuilder.gui.panels.TimelineTickPanel(); @@ -470,9 +484,12 @@ cadEvent.setText("CAD Event"); - cadEvent.addMouseListener(new java.awt.event.MouseAdapter() { - public void mousePressed(java.awt.event.MouseEvent evt) { + cadEvent.addMouseListener(new java.awt.event.MouseAdapter() + { + public void mousePressed(java.awt.event.MouseEvent evt) + { cadEventMousePressed(evt); } - public void mouseReleased(java.awt.event.MouseEvent evt) { + public void mouseReleased(java.awt.event.MouseEvent evt) + { cadEventMouseReleased(evt); } @@ -484,6 +501,8 @@ radioEvent.setText("Radio Event"); - radioEvent.addMouseListener(new java.awt.event.MouseAdapter() { - public void mousePressed(java.awt.event.MouseEvent evt) { + radioEvent.addMouseListener(new java.awt.event.MouseAdapter() + { + public void mousePressed(java.awt.event.MouseEvent evt) + { radioEventMousePressed(evt); } @@ -539,6 +558,8 @@ okButton.setText("OK"); - okButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + okButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { okButtonActionPerformed(evt); } @@ -546,6 +567,8 @@ cancelButton.setText("Cancel"); - cancelButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + cancelButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { cancelButtonActionPerformed(evt); } @@ -590,6 +613,8 @@ editEventList.setText("Edit..."); - editEventList.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + editEventList.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { editEventListActionPerformed(evt); } @@ -604,49 +629,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:"); + + labelTMCAL.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N + labelTMCAL.setText("TMCAL Logs:"); + + labelNoiseDescription.setEditable(false); + labelNoiseDescription.setColumns(20); + labelNoiseDescription.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N + labelNoiseDescription.setLineWrap(true); + labelNoiseDescription.setRows(5); + labelNoiseDescription.setText("Noise events will be randomly generated for the simulation with frequencies based on the control selections made below"); + labelNoiseDescription.setWrapStyleWord(true); + labelNoiseDescription.setAutoscrolls(false); + labelNoiseDescription.setBorder(null); + labelNoiseDescription.setDisabledTextColor(new java.awt.Color(0, 0, 0)); + labelNoiseDescription.setFocusable(false); + labelNoiseDescription.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()); @@ -657,29 +686,29 @@ .addContainerGap(21, Short.MAX_VALUE) .addGroup(addNoiseFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(jTextArea1, javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(labelNoiseDescription, 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(labelTMCAL, 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(sliderRadioChatter, javax.swing.GroupLayout.PREFERRED_SIZE, 245, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(sliderLaneClosures, javax.swing.GroupLayout.PREFERRED_SIZE, 245, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(sliderTMCAL, javax.swing.GroupLayout.PREFERRED_SIZE, 245, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(sliderMinorEvents, javax.swing.GroupLayout.PREFERRED_SIZE, 245, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(sliderBackgroundNoise, 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)) ); @@ -688,33 +717,33 @@ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, addNoiseFrameLayout.createSequentialGroup() .addContainerGap() - .addComponent(jTextArea1, javax.swing.GroupLayout.DEFAULT_SIZE, 39, Short.MAX_VALUE) + .addComponent(labelNoiseDescription, 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(sliderRadioChatter, 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(sliderLaneClosures, 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(labelTMCAL) + .addComponent(sliderTMCAL, 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(sliderBackgroundNoise, 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(sliderMinorEvents, 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()) ); @@ -816,6 +845,8 @@ zoomSlider.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR)); zoomSlider.setFocusable(false); - zoomSlider.addChangeListener(new javax.swing.event.ChangeListener() { - public void stateChanged(javax.swing.event.ChangeEvent evt) { + zoomSlider.addChangeListener(new javax.swing.event.ChangeListener() + { + public void stateChanged(javax.swing.event.ChangeEvent evt) + { zoomSliderStateChanged(evt); } @@ -887,6 +918,8 @@ selectButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); selectButton.setPreferredSize(new java.awt.Dimension(30, 25)); - selectButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + selectButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { selectButtonActionPerformed(evt); } @@ -901,6 +934,8 @@ maintenanceRadioButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); maintenanceRadioButton.setPreferredSize(new java.awt.Dimension(30, 25)); - maintenanceRadioButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + maintenanceRadioButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { maintenanceRadioButtonActionPerformed(evt); } @@ -913,6 +948,8 @@ tmtRadioButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); tmtRadioButton.setPreferredSize(new java.awt.Dimension(30, 25)); - tmtRadioButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + tmtRadioButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { tmtRadioButtonActionPerformed(evt); } @@ -925,6 +962,8 @@ telephoneButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); telephoneButton.setPreferredSize(new java.awt.Dimension(30, 25)); - telephoneButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + telephoneButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { telephoneButtonActionPerformed(evt); } @@ -937,6 +976,8 @@ unitButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); unitButton.setPreferredSize(new java.awt.Dimension(30, 25)); - unitButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + unitButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { unitButtonActionPerformed(evt); } @@ -949,6 +990,8 @@ witnessButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); witnessButton.setPreferredSize(new java.awt.Dimension(30, 25)); - witnessButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + witnessButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { witnessButtonActionPerformed(evt); } @@ -961,6 +1004,8 @@ paramicsButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); paramicsButton.setPreferredSize(new java.awt.Dimension(30, 25)); - paramicsButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + paramicsButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { paramicsButtonActionPerformed(evt); } @@ -973,6 +1018,8 @@ towButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); towButton.setPreferredSize(new java.awt.Dimension(30, 25)); - towButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + towButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { towButtonActionPerformed(evt); } @@ -985,6 +1032,8 @@ audioButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); audioButton.setPreferredSize(new java.awt.Dimension(30, 25)); - audioButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + audioButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { audioButtonActionPerformed(evt); } @@ -997,6 +1046,8 @@ cctvButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); cctvButton.setPreferredSize(new java.awt.Dimension(30, 25)); - cctvButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + cctvButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { cctvButtonActionPerformed(evt); } @@ -1009,6 +1060,8 @@ cadButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); cadButton.setPreferredSize(new java.awt.Dimension(30, 25)); - cadButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + cadButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { cadButtonActionPerformed(evt); } @@ -1021,6 +1074,8 @@ chpRadioButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); chpRadioButton.setPreferredSize(new java.awt.Dimension(30, 25)); - chpRadioButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + chpRadioButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { chpRadioButtonActionPerformed(evt); } @@ -1091,6 +1146,8 @@ atmsEvalButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); atmsEvalButton.setPreferredSize(new java.awt.Dimension(30, 25)); - atmsEvalButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + atmsEvalButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { atmsEvalButtonActionPerformed(evt); } @@ -1103,6 +1160,8 @@ cmsEvalButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); cmsEvalButton.setPreferredSize(new java.awt.Dimension(30, 25)); - cmsEvalButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + cmsEvalButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { cmsEvalButtonActionPerformed(evt); } @@ -1115,6 +1174,8 @@ cadEvalButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); cadEvalButton.setPreferredSize(new java.awt.Dimension(30, 25)); - cadEvalButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + cadEvalButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { cadEvalButtonActionPerformed(evt); } @@ -1127,6 +1188,8 @@ facilitatorEvalButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); facilitatorEvalButton.setPreferredSize(new java.awt.Dimension(30, 25)); - facilitatorEvalButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + facilitatorEvalButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { facilitatorEvalButtonActionPerformed(evt); } @@ -1139,6 +1202,8 @@ activityLogEvalButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); activityLogEvalButton.setPreferredSize(new java.awt.Dimension(30, 25)); - activityLogEvalButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + activityLogEvalButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { activityLogEvalButtonActionPerformed(evt); } @@ -1151,6 +1216,8 @@ radioEvalButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); radioEvalButton.setPreferredSize(new java.awt.Dimension(30, 25)); - radioEvalButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + radioEvalButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { radioEvalButtonActionPerformed(evt); } @@ -1196,6 +1263,8 @@ zoomInIcon.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/ZoomIn.png"))); // NOI18N zoomInIcon.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); - zoomInIcon.addMouseListener(new java.awt.event.MouseAdapter() { - public void mouseClicked(java.awt.event.MouseEvent evt) { + zoomInIcon.addMouseListener(new java.awt.event.MouseAdapter() + { + public void mouseClicked(java.awt.event.MouseEvent evt) + { zoomInIconMouseClicked(evt); } @@ -1204,6 +1273,8 @@ zoomOutIcon.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/ZoomOut.png"))); // NOI18N zoomOutIcon.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); - zoomOutIcon.addMouseListener(new java.awt.event.MouseAdapter() { - public void mouseClicked(java.awt.event.MouseEvent evt) { + zoomOutIcon.addMouseListener(new java.awt.event.MouseAdapter() + { + public void mouseClicked(java.awt.event.MouseEvent evt) + { zoomOutIconMouseClicked(evt); } @@ -1228,6 +1299,8 @@ btnAddTime.setText("+15:00"); - btnAddTime.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + btnAddTime.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { btnAddTimeActionPerformed(evt); } @@ -1310,4 +1383,5 @@ */ private void zoomSliderStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_zoomSliderStateChanged + //Moving the zoom slider always refreshes the window ScriptBuilderGuiConstants.PIXEL_WIDTH_PER_HORIZONTAL_TICK = zoomSlider.getValue(); this.update(null, theIncident); @@ -1406,7 +1480,7 @@ * @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 + }//GEN-LAST:event_btnCancelNoiseActionPerformed /** @@ -1416,10 +1490,10 @@ * @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 = sliderRadioChatter.getValue() + sliderLaneClosures.getValue() + sliderTMCAL.getValue() + sliderMinorEvents.getValue() + sliderBackgroundNoise.getValue(); total /= 5; @@ -1453,5 +1527,5 @@ this.update(null, theIncident); -}//GEN-LAST:event_jButton2ActionPerformed +}//GEN-LAST:event_btnGenerateNoiseActionPerformed /** @@ -1683,4 +1757,10 @@ }//GEN-LAST:event_zoomOutIconMouseClicked + /** + * Add 15 minutes to the end of the timeline. This allows the user to add + * new events past the current end of the incident + * + * @param evt the button press event + */ private void btnAddTimeActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_btnAddTimeActionPerformed {//GEN-HEADEREND:event_btnAddTimeActionPerformed @@ -1722,55 +1802,5 @@ return version; } - -// /** -// * Runs the script builder. -// * -// * @param args the command line arguments -// */ -// public static void main(String args[]) -// { -// try -// { -// UIManager.setLookAndFeel("com.sun.java.swing.plaf.gtk.GTKLookAndFeel"); -// } -// catch (ClassNotFoundException ex) -// { -// } -// catch (InstantiationException ex) -// { -// } -// catch (IllegalAccessException ex) -// { -// } -// catch (UnsupportedLookAndFeelException ex) -// { -// } -// -// try -// { -// UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel"); -// } -// catch (ClassNotFoundException ex) -// { -// } -// catch (InstantiationException ex) -// { -// } -// catch (IllegalAccessException ex) -// { -// } -// catch (UnsupportedLookAndFeelException ex) -// { -// } -// -// java.awt.EventQueue.invokeLater( -// new Runnable() -// { -// public void run() -// { -// new IncidentEditorFrame().setVisible(true); -// } -// }); -// } + // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JButton activityLogEvalButton; @@ -1779,4 +1809,6 @@ private javax.swing.JButton audioButton; private javax.swing.JButton btnAddTime; + private javax.swing.JButton btnCancelNoise; + private javax.swing.JButton btnGenerateNoise; private javax.swing.JButton cadButton; private javax.swing.JButton cadEvalButton; @@ -1800,14 +1832,5 @@ private scriptbuilder.gui.panels.IncidentNumberPanel incidentNumberPanel1; private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel1; - private javax.swing.JButton jButton1; - private javax.swing.JButton jButton2; - 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 jLabel2; - private javax.swing.JLabel jLabel20; - private javax.swing.JLabel jLabel21; private javax.swing.JLabel jLabel3; private javax.swing.JLabel jLabel4; @@ -1818,10 +1841,12 @@ private javax.swing.JMenuItem jMenuItem5; private javax.swing.JMenuItem jMenuItem6; - 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 labelLaneClosures; + private javax.swing.JLabel labelLeastFreq; + private javax.swing.JLabel labelMinorEvents; + private javax.swing.JLabel labelMostFreq; + private javax.swing.JTextArea labelNoiseDescription; + private javax.swing.JLabel labelRadioChatter; + private javax.swing.JLabel labelTMCAL; private javax.swing.JButton maintenanceRadioButton; private javax.swing.JButton okButton; @@ -1839,4 +1864,9 @@ private javax.swing.JPanel scriptEventsPanel1; private javax.swing.JButton selectButton; + private javax.swing.JSlider sliderBackgroundNoise; + private javax.swing.JSlider sliderLaneClosures; + private javax.swing.JSlider sliderMinorEvents; + private javax.swing.JSlider sliderRadioChatter; + private javax.swing.JSlider sliderTMCAL; private javax.swing.JButton telephoneButton; private scriptbuilder.gui.panels.TimeStampPanel timeStampPanel; Index: trunk/src/scriptbuilder/gui/IncidentEditorFrame.form =================================================================== --- trunk/src/scriptbuilder/gui/IncidentEditorFrame.form (revision 104) +++ trunk/src/scriptbuilder/gui/IncidentEditorFrame.form (revision 110) @@ -231,32 +231,32 @@ - + - + - + - - - - + + + + - + - - - - - + + + + + - + - + @@ -272,39 +272,39 @@ - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -314,5 +314,5 @@ - + @@ -322,9 +322,9 @@ - - - - - + + + + + @@ -334,7 +334,7 @@ - - - + + + @@ -344,5 +344,5 @@ - + @@ -366,7 +366,7 @@ - - - + + + @@ -376,7 +376,7 @@ - - - + + + @@ -386,26 +386,26 @@ - + - - - - + + + + - - - - + + + + - +