Index: trunk/src/event/editor/frame/PropertyModel.java =================================================================== --- trunk/src/event/editor/frame/PropertyModel.java (revision 134) +++ trunk/src/event/editor/frame/PropertyModel.java (revision 145) @@ -70,4 +70,5 @@ try { + //todo: this is where there are problems with initializing the unit window JPanel panel = (JPanel) classMap.get(property).newInstance(); @@ -82,5 +83,5 @@ { System.err.println("Could not create panel of type \"" + property + "\""); - } + } } Index: trunk/src/event/editor/frame/Editor.java =================================================================== --- trunk/src/event/editor/frame/Editor.java (revision 134) +++ trunk/src/event/editor/frame/Editor.java (revision 145) @@ -11,4 +11,5 @@ import scriptbuilder.gui.IncidentEditorFrame; import scriptbuilder.gui.ScriptBuilderFrame; +import scriptbuilder.gui.ScriptBuilderGuiConstants; import scriptbuilder.gui.panels.IncidentTimelinePanel; import scriptbuilder.structures.ScriptEvent; @@ -32,5 +33,8 @@ model.addEventPanel(property, se); } - + /** + * adds all of the events from the timeslice to the incidentTimelinePanel + * @param ts the timeslice to be added + */ public void setSlice(TimeSlice ts) { @@ -42,5 +46,5 @@ for (I_ScriptEvent se : slice.events) { - + this.addEvent(IncidentTimelinePanel.eventTypeToPropertyMap.get(se.getScriptEventType()), se); @@ -52,7 +56,66 @@ System.out.println("[" + eventTime + "]"); txtEventStart.setText(eventTime); + List timesS = timeGenerator(eventTime,"s"); + List timesM = timeGenerator(eventTime,"m"); + List timesH = timeGenerator(eventTime,"h"); + timeHourComboSelector.setModel(new DefaultComboBoxModel(timesH.toArray())); + timeMinuteComboSelector.setModel(new DefaultComboBoxModel(timesM.toArray())); + timeSecondComboSelector.setModel(new DefaultComboBoxModel(timesS.toArray())); + timeHourComboSelector.setSelectedItem(slice.getTime()/3600); + timeMinuteComboSelector.setSelectedItem((slice.getTime()%3600)/60); + timeSecondComboSelector.setSelectedItem(slice.getTime()%60); } } + + private List timeGenerator(String time,String type) + { + List times = new ArrayList(); + String[] timeArray = time.split(":"); + int currTime = 0; + switch(type) + { + case "h": + { + currTime = Integer.parseInt(timeArray[0]); + for(int i = 0;i< ScriptBuilderGuiConstants.MAX_SIMULATION_LENGTH/3600;i++) + { + times.add(i); + } + break; + } + case "m": + { + currTime = Integer.parseInt(timeArray[1]); + for(int i = 0; i<60;i++) + { + times.add(i); + } + + break; + } + case "s": + { + //includes times 0,20,40,80 + currTime = Integer.parseInt(timeArray[2]); + for(int i = 0; i<60;i+=ScriptBuilderGuiConstants.HORIZONTAL_TICK_RESOLUTION) + { + times.add(i); + } + break; + } + default: + { + } + + } + + + //times.add(time); + + return times; + } + + private ActionListener optionalChangeListener = new ActionListener() @@ -123,5 +186,5 @@ } - + //this eventTime might need to be initialized to the correct time String eventTime = ""; @@ -159,7 +222,32 @@ //If we deleted the first event(s), this will add the offsets, //to ensure that events stay at the correct times - model.closePanels(); - } - }); + Object[] options = {"Yes","Cancel"}; + int result = JOptionPane.showOptionDialog(null,"Are you sure you want to exit without saving?", + "Exit", + JOptionPane.YES_NO_OPTION, + JOptionPane.QUESTION_MESSAGE, + null, + options, + options[1]); + switch (result){ + //should just close + case 0: + closeWindow(); + //this.setVisible(true); + break; + // should do nothing + case 1: + + break; + default: + break; + } + //add a do you want to close without saving popup window here + + } + }); + } + private void closeWindow(){ + this.dispose(); } @@ -171,11 +259,17 @@ @SuppressWarnings("unchecked") // //GEN-BEGIN:initComponents - private void initComponents() - { + private void initComponents() { eventTabsPane = new javax.swing.JTabbedPane(); bottomFramePanel = new javax.swing.JPanel(); txtEventStart = new javax.swing.JTextField(); + saveCloseBtn = new javax.swing.JButton(); btnRemoveCurrentEvent = new javax.swing.JButton(); + timeSecondComboSelector = new javax.swing.JComboBox<>(); + timeMinuteComboSelector = new javax.swing.JComboBox<>(); + timeHourComboSelector = new javax.swing.JComboBox<>(); + jLabel1 = new javax.swing.JLabel(); + jLabel2 = new javax.swing.JLabel(); + jLabel3 = new javax.swing.JLabel(); editorMenuBar = new javax.swing.JMenuBar(); menuEvaluations = new javax.swing.JMenu(); @@ -200,5 +294,5 @@ Witness = new javax.swing.JMenuItem(); - setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); + setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE); setTitle("Event Editor"); @@ -207,21 +301,53 @@ bottomFramePanelLayout.setHorizontalGroup( bottomFramePanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(0, 613, Short.MAX_VALUE) + .add(0, 70, Short.MAX_VALUE) ); bottomFramePanelLayout.setVerticalGroup( bottomFramePanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(0, 34, Short.MAX_VALUE) + .add(0, 45, Short.MAX_VALUE) ); txtEventStart.setText("00:00:00"); + txtEventStart.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + txtEventStartActionPerformed(evt); + } + }); + + saveCloseBtn.setText("Save and Close"); + saveCloseBtn.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + saveCloseBtnActionPerformed(evt); + } + }); btnRemoveCurrentEvent.setText("Remove This Event"); - btnRemoveCurrentEvent.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { + btnRemoveCurrentEvent.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { btnRemoveCurrentEventActionPerformed(evt); } }); + + timeSecondComboSelector.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Second" })); + timeSecondComboSelector.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + timeSecondComboSelectorActionPerformed(evt); + } + }); + + timeMinuteComboSelector.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Minute" })); + timeMinuteComboSelector.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + timeMinuteComboSelectorActionPerformed(evt); + } + }); + + timeHourComboSelector.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Hour" })); + + jLabel1.setText("Hour"); + + jLabel2.setText("Minute"); + + jLabel3.setText("Second"); menuEvaluations.setText("Evaluations"); @@ -230,8 +356,6 @@ ATMS.setText("ATMS"); ATMS.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/ATMSEval.png"))); // NOI18N - ATMS.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { + ATMS.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { multipleChange(evt); } @@ -242,8 +366,6 @@ ActivityLog.setText("Activity Log"); ActivityLog.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/ActivityLogEval.png"))); // NOI18N - ActivityLog.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { + ActivityLog.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { multipleChange(evt); } @@ -254,8 +376,6 @@ CAD.setText("CAD"); CAD.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/CADEval.png"))); // NOI18N - CAD.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { + CAD.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { multipleChange(evt); } @@ -266,15 +386,11 @@ CMS.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/CMSEval.png"))); // NOI18N CMS.setText("CMS"); - CMS.addMouseListener(new java.awt.event.MouseAdapter() - { - public void mouseClicked(java.awt.event.MouseEvent evt) - { + CMS.addMouseListener(new java.awt.event.MouseAdapter() { + public void mouseClicked(java.awt.event.MouseEvent evt) { multipleChangeListener(evt); } }); - CMS.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { + CMS.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { multipleChange(evt); } @@ -285,8 +401,6 @@ Facilitator.setText("Facilitator"); Facilitator.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/FacilitatorEval.png"))); // NOI18N - Facilitator.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { + Facilitator.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { optionalChange(evt); } @@ -297,8 +411,6 @@ Radio.setText("Radio"); Radio.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/RadioEval.png"))); // NOI18N - Radio.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { + Radio.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { optionalChange(evt); } @@ -313,8 +425,6 @@ MaintenanceRadio.setText("Maintenance Radio"); MaintenanceRadio.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/MaintenanceRadio.png"))); // NOI18N - MaintenanceRadio.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { + MaintenanceRadio.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { optionalChange(evt); } @@ -325,8 +435,6 @@ TMTRadio.setText("TMT Radio"); TMTRadio.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/TMTRadio.png"))); // NOI18N - TMTRadio.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { + TMTRadio.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { optionalChange(evt); } @@ -337,8 +445,6 @@ Telephone.setText("Telephone"); Telephone.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/Telephone.png"))); // NOI18N - Telephone.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { + Telephone.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { optionalChange(evt); } @@ -353,8 +459,6 @@ Audio.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/Audio.png"))); // NOI18N Audio.setText("Audio"); - Audio.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { + Audio.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { AudioActionPerformed(evt); } @@ -375,8 +479,6 @@ CHPRadio.setText("CHP Radio"); CHPRadio.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/CHPRadio.png"))); // NOI18N - CHPRadio.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { + CHPRadio.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { optionalChange(evt); } @@ -417,7 +519,21 @@ .add(txtEventStart, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(jLabel1) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(timeHourComboSelector, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(jLabel2) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(timeMinuteComboSelector, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(jLabel3) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(timeSecondComboSelector, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) .add(bottomFramePanel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) .add(btnRemoveCurrentEvent, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 226, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(saveCloseBtn) .addContainerGap()) ); @@ -426,10 +542,19 @@ .add(layout.createSequentialGroup() .addContainerGap() - .add(eventTabsPane, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 534, Short.MAX_VALUE) + .add(eventTabsPane, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 523, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) .add(bottomFramePanel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .add(txtEventStart, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .add(btnRemoveCurrentEvent))) + .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE) + .add(txtEventStart, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .add(timeSecondComboSelector, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .add(timeMinuteComboSelector, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .add(timeHourComboSelector, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .add(jLabel1) + .add(jLabel2) + .add(jLabel3)) + .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE) + .add(saveCloseBtn) + .add(btnRemoveCurrentEvent)))) ); @@ -471,11 +596,42 @@ }//GEN-LAST:event_AudioActionPerformed + private void saveCloseBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_saveCloseBtnActionPerformed + // TODO add your handling code here: + //closes the current frame + + //updateEventTime(); + if(!txtEventStart.getText().equals("")) + { + updateEventTime(); + } + model.closePanels(); + closeWindow(); + //this.dispatchEvent(new WindowEvent(this,WindowEvent.WINDOW_CLOSING)); + }//GEN-LAST:event_saveCloseBtnActionPerformed + + private void timeSecondComboSelectorActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_timeSecondComboSelectorActionPerformed + // TODO add your handling code here: + }//GEN-LAST:event_timeSecondComboSelectorActionPerformed + + private void timeMinuteComboSelectorActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_timeMinuteComboSelectorActionPerformed + // TODO add your handling code here: + }//GEN-LAST:event_timeMinuteComboSelectorActionPerformed + + private void txtEventStartActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_txtEventStartActionPerformed + // TODO add your handling code here: + }//GEN-LAST:event_txtEventStartActionPerformed + private void updateEventTime() { - String[] tokens = txtEventStart.getText().split(":"); - - int hrs = Integer.parseInt(tokens[0]); - int mins = Integer.parseInt(tokens[1]); - int secs = Integer.parseInt(tokens[2]); + +// String[] tokens = txtEventStart.getText().split(":"); +// +// int hrs = Integer.parseInt(tokens[0]); +// int mins = Integer.parseInt(tokens[1]); +// int secs = Integer.parseInt(tokens[2]); + int hrs = Integer.parseInt(timeHourComboSelector.getSelectedItem().toString()); + int mins = Integer.parseInt(timeMinuteComboSelector.getSelectedItem().toString()); + int secs = Integer.parseInt(timeSecondComboSelector.getSelectedItem().toString()); + int newTime = (3600 * hrs) + (60 * mins) + secs; @@ -493,8 +649,8 @@ } - SimpleDateFormat df = new SimpleDateFormat("HH:mm:ss"); - df.setTimeZone(TimeZone.getTimeZone("GMT")); - String eventTime = df.format(new Date(slice.getTime() * 1000)); - txtEventStart.setText(eventTime); +// SimpleDateFormat df = new SimpleDateFormat("HH:mm:ss"); +// df.setTimeZone(TimeZone.getTimeZone("GMT")); +// String eventTime = df.format(new Date(slice.getTime() * 1000)); +// txtEventStart.setText(eventTime); } } @@ -538,7 +694,14 @@ private javax.swing.JMenuBar editorMenuBar; private javax.swing.JTabbedPane eventTabsPane; + private javax.swing.JLabel jLabel1; + private javax.swing.JLabel jLabel2; + private javax.swing.JLabel jLabel3; private javax.swing.JMenu menuAutoData; private javax.swing.JMenu menuEvaluations; private javax.swing.JMenu menuInstructor; + private javax.swing.JButton saveCloseBtn; + private javax.swing.JComboBox timeHourComboSelector; + private javax.swing.JComboBox timeMinuteComboSelector; + private javax.swing.JComboBox timeSecondComboSelector; private javax.swing.JTextField txtEventStart; // End of variables declaration//GEN-END:variables Index: trunk/src/event/editor/frame/Editor.form =================================================================== --- trunk/src/event/editor/frame/Editor.form (revision 134) +++ trunk/src/event/editor/frame/Editor.form (revision 145) @@ -251,5 +251,5 @@ - + @@ -279,7 +279,21 @@ + + + + + + + + + + + + + + @@ -290,10 +304,21 @@ - + - - + + + + + + + + + + + + + @@ -311,10 +336,10 @@ - + - + @@ -325,4 +350,15 @@ + + + + + + + + + + + @@ -334,4 +370,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +