Changeset 53 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java


Ignore:
Timestamp:
08/09/2017 10:03:37 AM (9 years ago)
Author:
bmcguffin
Message:

Duplicated main ScriptBuilder? window. The new window will become the Incident Editor window (see Storyboard 2a-B). The main ScriptBuilder? window will become the Incident Combiner window (see storyboard 1a-B).

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r52 r53  
    271271 
    272272        // Hack to refresh the zoom 
    273         zoomSlider.setValue(zoomSlider.getValue() - 1); 
    274         zoomSlider.setValue(zoomSlider.getValue() + 1); 
    275  
     273        //This is stupid tbh 
     274        /* 
     275         zoomSlider.setValue(zoomSlider.getValue() - 1); 
     276         zoomSlider.setValue(zoomSlider.getValue() + 1); 
     277         */ 
    276278        // Set listener for scroll pane 
    277279        AdjustmentListener listener = new MyAdjustmentListener(); 
    … …  
    370372            ScriptIncident i = ((IncidentFocusedEvent) arg).incident; 
    371373 
    372  
    373374            //gotoIncident.setSelectedItem(i); 
    374375        } 
     376 
     377        zoomSlider.setMinimum(((timelineTickPanel.getVisibleRect().width - 20) 
     378                * ScriptBuilderGuiConstants.HORIZONTAL_TICK_RESOLUTION) 
     379                / Math.max(script.absoluteLength(), 1)); 
     380        zoomSlider.setMaximum(zoomSlider.getMinimum() + 20); 
    375381    } 
    376382 
    … …  
    443449        timelinesScrollPane = new javax.swing.JScrollPane(); 
    444450        timelineTickPanel = new scriptbuilder.gui.panels.TimelineTickPanel(); 
    445         incidentTimelinePanel1 = new scriptbuilder.gui.panels.IncidentTimelinePanel(); 
    446         incidentTimelinePanel2 = new scriptbuilder.gui.panels.IncidentTimelinePanel(); 
    447         incidentTimelinePanel8 = new scriptbuilder.gui.panels.IncidentTimelinePanel(); 
    448         incidentTimelinePanel3 = new scriptbuilder.gui.panels.IncidentTimelinePanel(); 
    449         incidentTimelinePanel6 = new scriptbuilder.gui.panels.IncidentTimelinePanel(); 
    450         incidentTimelinePanel5 = new scriptbuilder.gui.panels.IncidentTimelinePanel(); 
    451         incidentTimelinePanel4 = new scriptbuilder.gui.panels.IncidentTimelinePanel(); 
    452         incidentTimelinePanel7 = new scriptbuilder.gui.panels.IncidentTimelinePanel(); 
    453         incidentTimelinePanel10 = new scriptbuilder.gui.panels.IncidentTimelinePanel(); 
    454         incidentTimelinePanel9 = new scriptbuilder.gui.panels.IncidentTimelinePanel(); 
    455         incidentNumberPanel1 = new scriptbuilder.gui.panels.IncidentNumberPanel(); 
    456         incidentNumberPanel2 = new scriptbuilder.gui.panels.IncidentNumberPanel(); 
    457         incidentNumberPanel3 = new scriptbuilder.gui.panels.IncidentNumberPanel(); 
    458         incidentNumberPanel4 = new scriptbuilder.gui.panels.IncidentNumberPanel(); 
    459         incidentNumberPanel5 = new scriptbuilder.gui.panels.IncidentNumberPanel(); 
    460         incidentNumberPanel6 = new scriptbuilder.gui.panels.IncidentNumberPanel(); 
    461         incidentNumberPanel7 = new scriptbuilder.gui.panels.IncidentNumberPanel(); 
    462         incidentNumberPanel8 = new scriptbuilder.gui.panels.IncidentNumberPanel(); 
    463         incidentNumberPanel9 = new scriptbuilder.gui.panels.IncidentNumberPanel(); 
    464         incidentNumberPanel10 = new scriptbuilder.gui.panels.IncidentNumberPanel(); 
     451        incidentTimelinePanel1 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel(); 
     452        incidentTimelinePanel2 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel(); 
     453        incidentTimelinePanel8 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel(); 
     454        incidentTimelinePanel3 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel(); 
     455        incidentTimelinePanel6 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel(); 
     456        incidentTimelinePanel5 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel(); 
     457        incidentTimelinePanel4 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel(); 
     458        incidentTimelinePanel7 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel(); 
     459        incidentTimelinePanel10 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel(); 
     460        incidentTimelinePanel9 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel(); 
     461        incidentNumberPanel1 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel(); 
     462        incidentNumberPanel2 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel(); 
     463        incidentNumberPanel3 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel(); 
     464        incidentNumberPanel4 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel(); 
     465        incidentNumberPanel5 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel(); 
     466        incidentNumberPanel6 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel(); 
     467        incidentNumberPanel7 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel(); 
     468        incidentNumberPanel8 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel(); 
     469        incidentNumberPanel9 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel(); 
     470        incidentNumberPanel10 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel(); 
    465471        zoomSlider = new javax.swing.JSlider(); 
    466472        selectButton = new javax.swing.JButton(); 
    … …  
    920926        setBounds(new java.awt.Rectangle(0, 23, 800, 700)); 
    921927        setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR)); 
    922         setMaximumSize(new java.awt.Dimension(2147483647, 800)); 
    923928        setMinimumSize(new java.awt.Dimension(800, 700)); 
    924929 
    … …  
    12821287        timelinesScrollPane.setViewportView(timelineTickPanel); 
    12831288 
    1284         zoomSlider.setMaximum(21); 
    1285         zoomSlider.setMinimum(5); 
     1289        zoomSlider.setMaximum(22); 
     1290        zoomSlider.setMinimum(4); 
    12861291        zoomSlider.setOrientation(javax.swing.JSlider.VERTICAL); 
    1287         zoomSlider.setValue(13); 
     1292        zoomSlider.setValue(4); 
    12881293        zoomSlider.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR)); 
    12891294        zoomSlider.setFocusable(false); 
    … …  
    19411946     */ 
    19421947    private void zoomSliderStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_zoomSliderStateChanged 
    1943         ScriptBuilderGuiConstants.PIXEL_WIDTH_PER_HORIZONTAL_TICK = zoomSlider.getValue() * 2; 
     1948        ScriptBuilderGuiConstants.PIXEL_WIDTH_PER_HORIZONTAL_TICK = zoomSlider.getValue(); 
    19441949        this.update(script, script); 
    19451950        pack(); 
    … …  
    20512056 
    20522057        incidentFrame.setVisible(false); 
    2053         update(script,script); 
     2058        update(script, script); 
    20542059        repaint(); 
    20552060    }//GEN-LAST:event_incidentOkButtonActionPerformed 
    … …  
    21662171            script.saveFile = fc.getSelectedFile(); 
    21672172        } 
     2173        zoomSlider.setValue(zoomSlider.getMinimum()); 
     2174        update(script, script); 
    21682175    }//GEN-LAST:event_fileOpenActionPerformed 
    21692176 
    … …  
    28042811    private javax.swing.JFrame incidentFrame; 
    28052812    private javax.swing.JMenu incidentMenu; 
    2806     private scriptbuilder.gui.panels.IncidentNumberPanel incidentNumberPanel1; 
    2807     private scriptbuilder.gui.panels.IncidentNumberPanel incidentNumberPanel10; 
    2808     private scriptbuilder.gui.panels.IncidentNumberPanel incidentNumberPanel2; 
    2809     private scriptbuilder.gui.panels.IncidentNumberPanel incidentNumberPanel3; 
    2810     private scriptbuilder.gui.panels.IncidentNumberPanel incidentNumberPanel4; 
    2811     private scriptbuilder.gui.panels.IncidentNumberPanel incidentNumberPanel5; 
    2812     private scriptbuilder.gui.panels.IncidentNumberPanel incidentNumberPanel6; 
    2813     private scriptbuilder.gui.panels.IncidentNumberPanel incidentNumberPanel7; 
    2814     private scriptbuilder.gui.panels.IncidentNumberPanel incidentNumberPanel8; 
    2815     private scriptbuilder.gui.panels.IncidentNumberPanel incidentNumberPanel9; 
     2813    private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel1; 
     2814    private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel10; 
     2815    private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel2; 
     2816    private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel3; 
     2817    private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel4; 
     2818    private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel5; 
     2819    private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel6; 
     2820    private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel7; 
     2821    private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel8; 
     2822    private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel9; 
    28162823    private javax.swing.JButton incidentOkButton; 
    28172824    private javax.swing.JPopupMenu incidentPopupMenu; 
    2818     private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel1; 
    2819     private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel10; 
    2820     private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel2; 
    2821     private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel3; 
    2822     private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel4; 
    2823     private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel5; 
    2824     private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel6; 
    2825     private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel7; 
    2826     private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel8; 
    2827     private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel9; 
     2825    private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel1; 
     2826    private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel10; 
     2827    private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel2; 
     2828    private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel3; 
     2829    private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel4; 
     2830    private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel5; 
     2831    private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel6; 
     2832    private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel7; 
     2833    private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel8; 
     2834    private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel9; 
    28282835    private javax.swing.JButton jButton1; 
    28292836    private javax.swing.JButton jButton2; 
Note: See TracChangeset for help on using the changeset viewer.