Changeset 117 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder/gui/IncidentEditorFrame.java


Ignore:
Timestamp:
09/07/2017 02:08:40 PM (9 years ago)
Author:
bmcguffin
Message:

Redesigned the method by which the first event in an event is added to relative time 00:00:00.

Added a second timestamp panel to the incident editor screen, which displays absolute script time in red. The original timestamp panel displays time relative to the start of the incident, in black.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/scriptbuilder/gui/IncidentEditorFrame.java

    r113 r117  
    8989            { 
    9090                timeStampScrollPane.getHorizontalScrollBar() 
     91                        .setValue(timelinesScrollPane.getHorizontalScrollBar().getValue()); 
     92                timeStampScrollPane1.getHorizontalScrollBar() 
    9193                        .setValue(timelinesScrollPane.getHorizontalScrollBar().getValue()); 
    9294            } 
    … …  
    249251        initComponents(); 
    250252 
     253        absoluteTimeStampPanel.setOffset(savedOffset); 
     254        absoluteTimeStampPanel.setAbsolute(true); 
    251255        timelineTickPanel.update(theIncident, incidentTimelinePanel1); 
    252         timeStampPanel.update(theIncident, incidentTimelinePanel1); 
    253  
     256        absoluteTimeStampPanel.update(theIncident, incidentTimelinePanel1); 
     257        relativeTimeStampPanel.update(theIncident, incidentTimelinePanel1); 
    254258        incidentTimelinePanel1.timelinePanelUpdate(theIncident); 
    255259 
    … …  
    344348            //Update the appropriate panels 
    345349            timelineTickPanel.update(theIncident, incidentTimelinePanel1); 
    346             timeStampPanel.update(theIncident, incidentTimelinePanel1); 
     350            absoluteTimeStampPanel.update(theIncident, incidentTimelinePanel1); 
     351            relativeTimeStampPanel.update(theIncident, incidentTimelinePanel1); 
    347352 
    348353            incidentTimelinePanel1.timelinePanelUpdate(theIncident); 
    … …  
    384389            //gotoIncident.setSelectedItem(i); 
    385390        } 
    386          
     391 
    387392        //Regardless of update type, do these things to refresh the window 
    388          
    389393        //Resize the zoom slider scale so that the most zoomed-out state displays 
    390394        //the entire incident on the window 
    … …  
    480484        zoomOutIcon = new javax.swing.JLabel(); 
    481485        timeStampScrollPane = new javax.swing.JScrollPane(); 
    482         timeStampPanel = new scriptbuilder.gui.panels.TimeStampPanel(); 
     486        absoluteTimeStampPanel = new scriptbuilder.gui.panels.TimeStampPanel(); 
    483487        btnAddTime = new javax.swing.JButton(); 
     488        timeStampScrollPane1 = new javax.swing.JScrollPane(); 
     489        relativeTimeStampPanel = new scriptbuilder.gui.panels.TimeStampPanel(); 
    484490 
    485491        cadEvent.setText("CAD Event"); 
    … …  
    12851291        timeStampScrollPane.setVerticalScrollBarPolicy(javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER); 
    12861292 
    1287         javax.swing.GroupLayout timeStampPanelLayout = new javax.swing.GroupLayout(timeStampPanel); 
    1288         timeStampPanel.setLayout(timeStampPanelLayout); 
    1289         timeStampPanelLayout.setHorizontalGroup( 
    1290             timeStampPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 
     1293        javax.swing.GroupLayout absoluteTimeStampPanelLayout = new javax.swing.GroupLayout(absoluteTimeStampPanel); 
     1294        absoluteTimeStampPanel.setLayout(absoluteTimeStampPanelLayout); 
     1295        absoluteTimeStampPanelLayout.setHorizontalGroup( 
     1296            absoluteTimeStampPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 
    12911297            .addGap(0, 1036, Short.MAX_VALUE) 
    12921298        ); 
    1293         timeStampPanelLayout.setVerticalGroup( 
    1294             timeStampPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 
     1299        absoluteTimeStampPanelLayout.setVerticalGroup( 
     1300            absoluteTimeStampPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 
    12951301            .addGap(0, 100, Short.MAX_VALUE) 
    12961302        ); 
    12971303 
    1298         timeStampScrollPane.setViewportView(timeStampPanel); 
     1304        timeStampScrollPane.setViewportView(absoluteTimeStampPanel); 
    12991305 
    13001306        btnAddTime.setText("+15:00"); 
    … …  
    13061312            } 
    13071313        }); 
     1314 
     1315        timeStampScrollPane1.setBorder(null); 
     1316        timeStampScrollPane1.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); 
     1317        timeStampScrollPane1.setVerticalScrollBarPolicy(javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER); 
     1318 
     1319        javax.swing.GroupLayout relativeTimeStampPanelLayout = new javax.swing.GroupLayout(relativeTimeStampPanel); 
     1320        relativeTimeStampPanel.setLayout(relativeTimeStampPanelLayout); 
     1321        relativeTimeStampPanelLayout.setHorizontalGroup( 
     1322            relativeTimeStampPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 
     1323            .addGap(0, 1036, Short.MAX_VALUE) 
     1324        ); 
     1325        relativeTimeStampPanelLayout.setVerticalGroup( 
     1326            relativeTimeStampPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 
     1327            .addGap(0, 100, Short.MAX_VALUE) 
     1328        ); 
     1329 
     1330        timeStampScrollPane1.setViewportView(relativeTimeStampPanel); 
    13081331 
    13091332        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); 
    … …  
    13231346                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 
    13241347                            .addGroup(layout.createSequentialGroup() 
     1348                                .addComponent(zoomSlider, javax.swing.GroupLayout.PREFERRED_SIZE, 31, javax.swing.GroupLayout.PREFERRED_SIZE) 
     1349                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) 
     1350                                .addComponent(btnAddTime, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) 
     1351                            .addGroup(layout.createSequentialGroup() 
    13251352                                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 
    13261353                                    .addComponent(zoomInIcon) 
    13271354                                    .addComponent(zoomOutIcon)) 
    1328                                 .addGap(0, 0, Short.MAX_VALUE)) 
    1329                             .addGroup(layout.createSequentialGroup() 
    1330                                 .addComponent(zoomSlider, javax.swing.GroupLayout.PREFERRED_SIZE, 31, javax.swing.GroupLayout.PREFERRED_SIZE) 
    1331                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) 
    1332                                 .addComponent(btnAddTime, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))) 
     1355                                .addGap(0, 0, Short.MAX_VALUE)))) 
    13331356                    .addComponent(timelinesScrollPane, 0, 0, Short.MAX_VALUE) 
    13341357                    .addComponent(timeStampScrollPane) 
    … …  
    13361359                        .addComponent(scriptEventsPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) 
    13371360                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) 
    1338                         .addComponent(scriptEventsPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))) 
     1361                        .addComponent(scriptEventsPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) 
     1362                    .addComponent(timeStampScrollPane1)) 
    13391363                .addContainerGap()) 
    13401364        ); 
    … …  
    13421366            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 
    13431367            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() 
    1344                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 
     1368                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) 
    13451369                    .addGroup(layout.createSequentialGroup() 
    13461370                        .addContainerGap() 
    … …  
    13521376                                .addComponent(selectButton, javax.swing.GroupLayout.PREFERRED_SIZE, 55, javax.swing.GroupLayout.PREFERRED_SIZE)))) 
    13531377                    .addGroup(layout.createSequentialGroup() 
    1354                         .addGap(20, 20, 20) 
    1355                         .addComponent(zoomInIcon) 
    1356                         .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) 
     1378                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) 
    13571379                            .addGroup(layout.createSequentialGroup() 
    1358                                 .addGap(1, 1, 1) 
     1380                                .addGap(9, 9, 9) 
     1381                                .addComponent(zoomInIcon) 
     1382                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) 
    13591383                                .addComponent(zoomSlider, javax.swing.GroupLayout.PREFERRED_SIZE, 69, javax.swing.GroupLayout.PREFERRED_SIZE)) 
    13601384                            .addGroup(layout.createSequentialGroup() 
    1361                                 .addGap(17, 17, 17) 
     1385                                .addGap(61, 61, 61) 
    13621386                                .addComponent(btnAddTime, javax.swing.GroupLayout.PREFERRED_SIZE, 44, javax.swing.GroupLayout.PREFERRED_SIZE))) 
    1363                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) 
     1387                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) 
    13641388                        .addComponent(zoomOutIcon))) 
    13651389                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) 
    13661390                .addComponent(timeStampScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 20, javax.swing.GroupLayout.PREFERRED_SIZE) 
     1391                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) 
     1392                .addComponent(timeStampScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 20, javax.swing.GroupLayout.PREFERRED_SIZE) 
    13671393                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) 
    13681394                .addComponent(timelinesScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 324, javax.swing.GroupLayout.PREFERRED_SIZE) 
    … …  
    17601786     * Add 15 minutes to the end of the timeline. This allows the user to add 
    17611787     * new events past the current end of the incident 
    1762      *  
     1788     * 
    17631789     * @param evt the button press event 
    17641790     */ 
    … …  
    18021828        return version; 
    18031829    } 
    1804      
     1830 
    18051831    // Variables declaration - do not modify//GEN-BEGIN:variables 
     1832    private scriptbuilder.gui.panels.TimeStampPanel absoluteTimeStampPanel; 
    18061833    private javax.swing.JButton activityLogEvalButton; 
    18071834    private javax.swing.JFrame addNoiseFrame; 
    … …  
    18591886    private javax.swing.JComboBox radioTypeComboBox; 
    18601887    private javax.swing.JLabel radioTypeLabel; 
     1888    private scriptbuilder.gui.panels.TimeStampPanel relativeTimeStampPanel; 
    18611889    private javax.swing.JList scriptEventsList; 
    18621890    private javax.swing.JScrollPane scriptEventsPane; 
    … …  
    18701898    private javax.swing.JSlider sliderTMCAL; 
    18711899    private javax.swing.JButton telephoneButton; 
    1872     private scriptbuilder.gui.panels.TimeStampPanel timeStampPanel; 
    18731900    private javax.swing.JScrollPane timeStampScrollPane; 
     1901    private javax.swing.JScrollPane timeStampScrollPane1; 
    18741902    private scriptbuilder.gui.panels.TimelineTickPanel timelineTickPanel; 
    18751903    private javax.swing.JScrollPane timelinesScrollPane; 
Note: See TracChangeset for help on using the changeset viewer.