Changeset 53 in tmcsimulator-scriptbuilder for trunk/src


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).

Location:
trunk/src/scriptbuilder/gui
Files:
7 edited
3 copied

Legend:

Unmodified
Added
Removed

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

    r52 r53  
    10751075          </Layout> 
    10761076          <SubComponents> 
    1077             <Container class="scriptbuilder.gui.panels.IncidentTimelinePanel" name="incidentTimelinePanel1"> 
     1077            <Container class="scriptbuilder.gui.panels.ScriptBuilderTimelinePanel" name="incidentTimelinePanel1"> 
    10781078              <Properties> 
    10791079                <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> 
    … …  
    10991099              </Layout> 
    11001100            </Container> 
    1101             <Container class="scriptbuilder.gui.panels.IncidentTimelinePanel" name="incidentTimelinePanel2"> 
     1101            <Container class="scriptbuilder.gui.panels.ScriptBuilderTimelinePanel" name="incidentTimelinePanel2"> 
    11021102              <Properties> 
    11031103                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    11171117              </Layout> 
    11181118            </Container> 
    1119             <Container class="scriptbuilder.gui.panels.IncidentTimelinePanel" name="incidentTimelinePanel8"> 
     1119            <Container class="scriptbuilder.gui.panels.ScriptBuilderTimelinePanel" name="incidentTimelinePanel8"> 
    11201120              <Properties> 
    11211121                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    11351135              </Layout> 
    11361136            </Container> 
    1137             <Container class="scriptbuilder.gui.panels.IncidentTimelinePanel" name="incidentTimelinePanel3"> 
     1137            <Container class="scriptbuilder.gui.panels.ScriptBuilderTimelinePanel" name="incidentTimelinePanel3"> 
    11381138              <Properties> 
    11391139                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    11531153              </Layout> 
    11541154            </Container> 
    1155             <Container class="scriptbuilder.gui.panels.IncidentTimelinePanel" name="incidentTimelinePanel6"> 
     1155            <Container class="scriptbuilder.gui.panels.ScriptBuilderTimelinePanel" name="incidentTimelinePanel6"> 
    11561156              <Properties> 
    11571157                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    11711171              </Layout> 
    11721172            </Container> 
    1173             <Container class="scriptbuilder.gui.panels.IncidentTimelinePanel" name="incidentTimelinePanel5"> 
     1173            <Container class="scriptbuilder.gui.panels.ScriptBuilderTimelinePanel" name="incidentTimelinePanel5"> 
    11741174              <Properties> 
    11751175                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    11891189              </Layout> 
    11901190            </Container> 
    1191             <Container class="scriptbuilder.gui.panels.IncidentTimelinePanel" name="incidentTimelinePanel4"> 
     1191            <Container class="scriptbuilder.gui.panels.ScriptBuilderTimelinePanel" name="incidentTimelinePanel4"> 
    11921192              <Properties> 
    11931193                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    12071207              </Layout> 
    12081208            </Container> 
    1209             <Container class="scriptbuilder.gui.panels.IncidentTimelinePanel" name="incidentTimelinePanel7"> 
     1209            <Container class="scriptbuilder.gui.panels.ScriptBuilderTimelinePanel" name="incidentTimelinePanel7"> 
    12101210              <Properties> 
    12111211                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    12251225              </Layout> 
    12261226            </Container> 
    1227             <Container class="scriptbuilder.gui.panels.IncidentTimelinePanel" name="incidentTimelinePanel10"> 
     1227            <Container class="scriptbuilder.gui.panels.ScriptBuilderTimelinePanel" name="incidentTimelinePanel10"> 
    12281228              <Properties> 
    12291229                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    12431243              </Layout> 
    12441244            </Container> 
    1245             <Container class="scriptbuilder.gui.panels.IncidentTimelinePanel" name="incidentTimelinePanel9"> 
     1245            <Container class="scriptbuilder.gui.panels.ScriptBuilderTimelinePanel" name="incidentTimelinePanel9"> 
    12461246              <Properties> 
    12471247                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    12611261              </Layout> 
    12621262            </Container> 
    1263             <Container class="scriptbuilder.gui.panels.IncidentNumberPanel" name="incidentNumberPanel1"> 
     1263            <Container class="scriptbuilder.gui.panels.ScriptBuilderNumberPanel" name="incidentNumberPanel1"> 
    12641264              <Properties> 
    12651265                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    12791279              </Layout> 
    12801280            </Container> 
    1281             <Container class="scriptbuilder.gui.panels.IncidentNumberPanel" name="incidentNumberPanel2"> 
     1281            <Container class="scriptbuilder.gui.panels.ScriptBuilderNumberPanel" name="incidentNumberPanel2"> 
    12821282              <Properties> 
    12831283                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    12971297              </Layout> 
    12981298            </Container> 
    1299             <Container class="scriptbuilder.gui.panels.IncidentNumberPanel" name="incidentNumberPanel3"> 
     1299            <Container class="scriptbuilder.gui.panels.ScriptBuilderNumberPanel" name="incidentNumberPanel3"> 
    13001300              <Properties> 
    13011301                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    13151315              </Layout> 
    13161316            </Container> 
    1317             <Container class="scriptbuilder.gui.panels.IncidentNumberPanel" name="incidentNumberPanel4"> 
     1317            <Container class="scriptbuilder.gui.panels.ScriptBuilderNumberPanel" name="incidentNumberPanel4"> 
    13181318              <Properties> 
    13191319                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    13331333              </Layout> 
    13341334            </Container> 
    1335             <Container class="scriptbuilder.gui.panels.IncidentNumberPanel" name="incidentNumberPanel5"> 
     1335            <Container class="scriptbuilder.gui.panels.ScriptBuilderNumberPanel" name="incidentNumberPanel5"> 
    13361336              <Properties> 
    13371337                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    13511351              </Layout> 
    13521352            </Container> 
    1353             <Container class="scriptbuilder.gui.panels.IncidentNumberPanel" name="incidentNumberPanel6"> 
     1353            <Container class="scriptbuilder.gui.panels.ScriptBuilderNumberPanel" name="incidentNumberPanel6"> 
    13541354              <Properties> 
    13551355                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    13691369              </Layout> 
    13701370            </Container> 
    1371             <Container class="scriptbuilder.gui.panels.IncidentNumberPanel" name="incidentNumberPanel7"> 
     1371            <Container class="scriptbuilder.gui.panels.ScriptBuilderNumberPanel" name="incidentNumberPanel7"> 
    13721372              <Properties> 
    13731373                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    13871387              </Layout> 
    13881388            </Container> 
    1389             <Container class="scriptbuilder.gui.panels.IncidentNumberPanel" name="incidentNumberPanel8"> 
     1389            <Container class="scriptbuilder.gui.panels.ScriptBuilderNumberPanel" name="incidentNumberPanel8"> 
    13901390              <Properties> 
    13911391                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    14051405              </Layout> 
    14061406            </Container> 
    1407             <Container class="scriptbuilder.gui.panels.IncidentNumberPanel" name="incidentNumberPanel9"> 
     1407            <Container class="scriptbuilder.gui.panels.ScriptBuilderNumberPanel" name="incidentNumberPanel9"> 
    14081408              <Properties> 
    14091409                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    14231423              </Layout> 
    14241424            </Container> 
    1425             <Container class="scriptbuilder.gui.panels.IncidentNumberPanel" name="incidentNumberPanel10"> 
     1425            <Container class="scriptbuilder.gui.panels.ScriptBuilderNumberPanel" name="incidentNumberPanel10"> 
    14261426              <Properties> 
    14271427                <Property name="opaque" type="boolean" value="false"/> 

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

    r52 r53  
    448448        timelinesScrollPane = new javax.swing.JScrollPane(); 
    449449        timelineTickPanel = new scriptbuilder.gui.panels.TimelineTickPanel(); 
    450         incidentTimelinePanel1 = new scriptbuilder.gui.panels.IncidentTimelinePanel(); 
    451         incidentTimelinePanel2 = new scriptbuilder.gui.panels.IncidentTimelinePanel(); 
    452         incidentTimelinePanel8 = new scriptbuilder.gui.panels.IncidentTimelinePanel(); 
    453         incidentTimelinePanel3 = new scriptbuilder.gui.panels.IncidentTimelinePanel(); 
    454         incidentTimelinePanel6 = new scriptbuilder.gui.panels.IncidentTimelinePanel(); 
    455         incidentTimelinePanel5 = new scriptbuilder.gui.panels.IncidentTimelinePanel(); 
    456         incidentTimelinePanel4 = new scriptbuilder.gui.panels.IncidentTimelinePanel(); 
    457         incidentTimelinePanel7 = new scriptbuilder.gui.panels.IncidentTimelinePanel(); 
    458         incidentTimelinePanel10 = new scriptbuilder.gui.panels.IncidentTimelinePanel(); 
    459         incidentTimelinePanel9 = new scriptbuilder.gui.panels.IncidentTimelinePanel(); 
    460         incidentNumberPanel1 = new scriptbuilder.gui.panels.IncidentNumberPanel(); 
    461         incidentNumberPanel2 = new scriptbuilder.gui.panels.IncidentNumberPanel(); 
    462         incidentNumberPanel3 = new scriptbuilder.gui.panels.IncidentNumberPanel(); 
    463         incidentNumberPanel4 = new scriptbuilder.gui.panels.IncidentNumberPanel(); 
    464         incidentNumberPanel5 = new scriptbuilder.gui.panels.IncidentNumberPanel(); 
    465         incidentNumberPanel6 = new scriptbuilder.gui.panels.IncidentNumberPanel(); 
    466         incidentNumberPanel7 = new scriptbuilder.gui.panels.IncidentNumberPanel(); 
    467         incidentNumberPanel8 = new scriptbuilder.gui.panels.IncidentNumberPanel(); 
    468         incidentNumberPanel9 = new scriptbuilder.gui.panels.IncidentNumberPanel(); 
    469         incidentNumberPanel10 = new scriptbuilder.gui.panels.IncidentNumberPanel(); 
     450        incidentTimelinePanel1 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel(); 
     451        incidentTimelinePanel2 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel(); 
     452        incidentTimelinePanel8 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel(); 
     453        incidentTimelinePanel3 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel(); 
     454        incidentTimelinePanel6 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel(); 
     455        incidentTimelinePanel5 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel(); 
     456        incidentTimelinePanel4 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel(); 
     457        incidentTimelinePanel7 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel(); 
     458        incidentTimelinePanel10 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel(); 
     459        incidentTimelinePanel9 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel(); 
     460        incidentNumberPanel1 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel(); 
     461        incidentNumberPanel2 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel(); 
     462        incidentNumberPanel3 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel(); 
     463        incidentNumberPanel4 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel(); 
     464        incidentNumberPanel5 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel(); 
     465        incidentNumberPanel6 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel(); 
     466        incidentNumberPanel7 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel(); 
     467        incidentNumberPanel8 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel(); 
     468        incidentNumberPanel9 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel(); 
     469        incidentNumberPanel10 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel(); 
    470470        scriptEventsPanel = new javax.swing.JPanel(); 
    471471        scriptEventsPane = new javax.swing.JScrollPane(); 
    … …  
    28962896    private javax.swing.JTextField incidentName; 
    28972897    private javax.swing.JTextField incidentNumber; 
    2898     private scriptbuilder.gui.panels.IncidentNumberPanel incidentNumberPanel1; 
    2899     private scriptbuilder.gui.panels.IncidentNumberPanel incidentNumberPanel10; 
    2900     private scriptbuilder.gui.panels.IncidentNumberPanel incidentNumberPanel2; 
    2901     private scriptbuilder.gui.panels.IncidentNumberPanel incidentNumberPanel3; 
    2902     private scriptbuilder.gui.panels.IncidentNumberPanel incidentNumberPanel4; 
    2903     private scriptbuilder.gui.panels.IncidentNumberPanel incidentNumberPanel5; 
    2904     private scriptbuilder.gui.panels.IncidentNumberPanel incidentNumberPanel6; 
    2905     private scriptbuilder.gui.panels.IncidentNumberPanel incidentNumberPanel7; 
    2906     private scriptbuilder.gui.panels.IncidentNumberPanel incidentNumberPanel8; 
    2907     private scriptbuilder.gui.panels.IncidentNumberPanel incidentNumberPanel9; 
     2898    private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel1; 
     2899    private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel10; 
     2900    private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel2; 
     2901    private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel3; 
     2902    private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel4; 
     2903    private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel5; 
     2904    private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel6; 
     2905    private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel7; 
     2906    private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel8; 
     2907    private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel9; 
    29082908    private javax.swing.JButton incidentOkButton; 
    29092909    private javax.swing.JPopupMenu incidentPopupMenu; 
    2910     private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel1; 
    2911     private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel10; 
    2912     private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel2; 
    2913     private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel3; 
    2914     private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel4; 
    2915     private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel5; 
    2916     private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel6; 
    2917     private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel7; 
    2918     private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel8; 
    2919     private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel9; 
     2910    private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel1; 
     2911    private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel10; 
     2912    private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel2; 
     2913    private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel3; 
     2914    private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel4; 
     2915    private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel5; 
     2916    private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel6; 
     2917    private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel7; 
     2918    private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel8; 
     2919    private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel9; 
    29202920    private javax.swing.JButton jButton1; 
    29212921    private javax.swing.JButton jButton2; 

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

    r52 r53  
    867867      <Color id="Default Cursor"/> 
    868868    </Property> 
    869     <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> 
    870       <Dimension value="[2147483647, 800]"/> 
    871     </Property> 
    872869    <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> 
    873870      <Dimension value="[800, 700]"/> 
    … …  
    10801077          </Layout> 
    10811078          <SubComponents> 
    1082             <Container class="scriptbuilder.gui.panels.IncidentTimelinePanel" name="incidentTimelinePanel1"> 
     1079            <Container class="scriptbuilder.gui.panels.ScriptBuilderTimelinePanel" name="incidentTimelinePanel1"> 
    10831080              <Properties> 
    10841081                <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> 
    … …  
    11041101              </Layout> 
    11051102            </Container> 
    1106             <Container class="scriptbuilder.gui.panels.IncidentTimelinePanel" name="incidentTimelinePanel2"> 
     1103            <Container class="scriptbuilder.gui.panels.ScriptBuilderTimelinePanel" name="incidentTimelinePanel2"> 
    11071104              <Properties> 
    11081105                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    11221119              </Layout> 
    11231120            </Container> 
    1124             <Container class="scriptbuilder.gui.panels.IncidentTimelinePanel" name="incidentTimelinePanel8"> 
     1121            <Container class="scriptbuilder.gui.panels.ScriptBuilderTimelinePanel" name="incidentTimelinePanel8"> 
    11251122              <Properties> 
    11261123                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    11401137              </Layout> 
    11411138            </Container> 
    1142             <Container class="scriptbuilder.gui.panels.IncidentTimelinePanel" name="incidentTimelinePanel3"> 
     1139            <Container class="scriptbuilder.gui.panels.ScriptBuilderTimelinePanel" name="incidentTimelinePanel3"> 
    11431140              <Properties> 
    11441141                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    11581155              </Layout> 
    11591156            </Container> 
    1160             <Container class="scriptbuilder.gui.panels.IncidentTimelinePanel" name="incidentTimelinePanel6"> 
     1157            <Container class="scriptbuilder.gui.panels.ScriptBuilderTimelinePanel" name="incidentTimelinePanel6"> 
    11611158              <Properties> 
    11621159                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    11761173              </Layout> 
    11771174            </Container> 
    1178             <Container class="scriptbuilder.gui.panels.IncidentTimelinePanel" name="incidentTimelinePanel5"> 
     1175            <Container class="scriptbuilder.gui.panels.ScriptBuilderTimelinePanel" name="incidentTimelinePanel5"> 
    11791176              <Properties> 
    11801177                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    11941191              </Layout> 
    11951192            </Container> 
    1196             <Container class="scriptbuilder.gui.panels.IncidentTimelinePanel" name="incidentTimelinePanel4"> 
     1193            <Container class="scriptbuilder.gui.panels.ScriptBuilderTimelinePanel" name="incidentTimelinePanel4"> 
    11971194              <Properties> 
    11981195                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    12121209              </Layout> 
    12131210            </Container> 
    1214             <Container class="scriptbuilder.gui.panels.IncidentTimelinePanel" name="incidentTimelinePanel7"> 
     1211            <Container class="scriptbuilder.gui.panels.ScriptBuilderTimelinePanel" name="incidentTimelinePanel7"> 
    12151212              <Properties> 
    12161213                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    12301227              </Layout> 
    12311228            </Container> 
    1232             <Container class="scriptbuilder.gui.panels.IncidentTimelinePanel" name="incidentTimelinePanel10"> 
     1229            <Container class="scriptbuilder.gui.panels.ScriptBuilderTimelinePanel" name="incidentTimelinePanel10"> 
    12331230              <Properties> 
    12341231                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    12481245              </Layout> 
    12491246            </Container> 
    1250             <Container class="scriptbuilder.gui.panels.IncidentTimelinePanel" name="incidentTimelinePanel9"> 
     1247            <Container class="scriptbuilder.gui.panels.ScriptBuilderTimelinePanel" name="incidentTimelinePanel9"> 
    12511248              <Properties> 
    12521249                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    12661263              </Layout> 
    12671264            </Container> 
    1268             <Container class="scriptbuilder.gui.panels.IncidentNumberPanel" name="incidentNumberPanel1"> 
     1265            <Container class="scriptbuilder.gui.panels.ScriptBuilderNumberPanel" name="incidentNumberPanel1"> 
    12691266              <Properties> 
    12701267                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    12841281              </Layout> 
    12851282            </Container> 
    1286             <Container class="scriptbuilder.gui.panels.IncidentNumberPanel" name="incidentNumberPanel2"> 
     1283            <Container class="scriptbuilder.gui.panels.ScriptBuilderNumberPanel" name="incidentNumberPanel2"> 
    12871284              <Properties> 
    12881285                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    13021299              </Layout> 
    13031300            </Container> 
    1304             <Container class="scriptbuilder.gui.panels.IncidentNumberPanel" name="incidentNumberPanel3"> 
     1301            <Container class="scriptbuilder.gui.panels.ScriptBuilderNumberPanel" name="incidentNumberPanel3"> 
    13051302              <Properties> 
    13061303                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    13201317              </Layout> 
    13211318            </Container> 
    1322             <Container class="scriptbuilder.gui.panels.IncidentNumberPanel" name="incidentNumberPanel4"> 
     1319            <Container class="scriptbuilder.gui.panels.ScriptBuilderNumberPanel" name="incidentNumberPanel4"> 
    13231320              <Properties> 
    13241321                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    13381335              </Layout> 
    13391336            </Container> 
    1340             <Container class="scriptbuilder.gui.panels.IncidentNumberPanel" name="incidentNumberPanel5"> 
     1337            <Container class="scriptbuilder.gui.panels.ScriptBuilderNumberPanel" name="incidentNumberPanel5"> 
    13411338              <Properties> 
    13421339                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    13561353              </Layout> 
    13571354            </Container> 
    1358             <Container class="scriptbuilder.gui.panels.IncidentNumberPanel" name="incidentNumberPanel6"> 
     1355            <Container class="scriptbuilder.gui.panels.ScriptBuilderNumberPanel" name="incidentNumberPanel6"> 
    13591356              <Properties> 
    13601357                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    13741371              </Layout> 
    13751372            </Container> 
    1376             <Container class="scriptbuilder.gui.panels.IncidentNumberPanel" name="incidentNumberPanel7"> 
     1373            <Container class="scriptbuilder.gui.panels.ScriptBuilderNumberPanel" name="incidentNumberPanel7"> 
    13771374              <Properties> 
    13781375                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    13921389              </Layout> 
    13931390            </Container> 
    1394             <Container class="scriptbuilder.gui.panels.IncidentNumberPanel" name="incidentNumberPanel8"> 
     1391            <Container class="scriptbuilder.gui.panels.ScriptBuilderNumberPanel" name="incidentNumberPanel8"> 
    13951392              <Properties> 
    13961393                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    14101407              </Layout> 
    14111408            </Container> 
    1412             <Container class="scriptbuilder.gui.panels.IncidentNumberPanel" name="incidentNumberPanel9"> 
     1409            <Container class="scriptbuilder.gui.panels.ScriptBuilderNumberPanel" name="incidentNumberPanel9"> 
    14131410              <Properties> 
    14141411                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    14281425              </Layout> 
    14291426            </Container> 
    1430             <Container class="scriptbuilder.gui.panels.IncidentNumberPanel" name="incidentNumberPanel10"> 
     1427            <Container class="scriptbuilder.gui.panels.ScriptBuilderNumberPanel" name="incidentNumberPanel10"> 
    14311428              <Properties> 
    14321429                <Property name="opaque" type="boolean" value="false"/> 
    … …  
    14521449    <Component class="javax.swing.JSlider" name="zoomSlider"> 
    14531450      <Properties> 
    1454         <Property name="maximum" type="int" value="21"/> 
    1455         <Property name="minimum" type="int" value="5"/> 
     1451        <Property name="maximum" type="int" value="22"/> 
     1452        <Property name="minimum" type="int" value="4"/> 
    14561453        <Property name="orientation" type="int" value="1"/> 
    1457         <Property name="value" type="int" value="13"/> 
     1454        <Property name="value" type="int" value="4"/> 
    14581455        <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor"> 
    14591456          <Color id="Default Cursor"/> 

  • 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; 

  • trunk/src/scriptbuilder/gui/drawers/IncidentTimelineDrawer.java

    r1 r53  
    4141        } 
    4242    } 
     43 
     44    /** 
     45     * Draw the incident line. Then, utilize TimeSliceDrawer to draw the 
     46     * timeslices. 
     47     * 
     48     * @param g2d the graphics component 
     49     * @param incident the incident to be drawn 
     50     */ 
     51    public static void DrawScriptBuilderTimeline(Graphics2D g2d, 
     52            ScriptIncident incident) 
     53    { 
     54        // Draw the timeline 
     55        g2d.setColor(incident.color); 
     56        g2d.fillRect(incident.offset / ScriptBuilderGuiConstants.HORIZONTAL_TICK_RESOLUTION 
     57                * ScriptBuilderGuiConstants.PIXEL_WIDTH_PER_HORIZONTAL_TICK, 
     58                ScriptBuilderGuiConstants.TIMELINE_TOP_MARGIN, 
     59                incident.length / ScriptBuilderGuiConstants.HORIZONTAL_TICK_RESOLUTION 
     60                * ScriptBuilderGuiConstants.PIXEL_WIDTH_PER_HORIZONTAL_TICK, 
     61                ScriptBuilderGuiConstants.TIMELINE_HEIGHT); 
     62 
     63        // Draw each time slice 
     64        for (TimeSlice slice : incident.getSlices()) 
     65        { 
     66            TimeSliceDrawer.DrawScriptBuilderTimeSlice(g2d, slice); 
     67        } 
     68    } 
    4369} 

  • trunk/src/scriptbuilder/gui/drawers/TimeSliceDrawer.java

    r7 r53  
    9696        } 
    9797    } 
     98     
     99    /** 
     100     * Draw the events in this timeslice. If any exist, draw the slice event 
     101     * image. If the incident isn't collapsed, draw the event icons as well. 
     102     * 
     103     * @param g2d the graphics component 
     104     * @param slice the timeSlice to draw 
     105     * @param collapsed if true, don't draw the event icons 
     106     */ 
     107    public static void DrawScriptBuilderTimeSlice(Graphics2D g2d, TimeSlice slice) 
     108    { 
     109        // If this is an empty slice, return 
     110        if (slice.events.size() == 0) 
     111        { 
     112            return; 
     113        } 
     114 
     115        // Draw the slice event icon to show that there are events here 
     116        g2d.drawImage(getSliceEventImage(), slice.getX() 
     117                - ScriptBuilderGuiConstants.EVENT_ICON_WIDTH, 
     118                ScriptBuilderGuiConstants.TIMELINE_EVENT_ICON_MARGIN, null); 
     119    } 
    98120} 

  • trunk/src/scriptbuilder/gui/panels/IncidentTimelineTickPanel.java

    r31 r53  
    2121 * @author Bryan McGuffin 
    2222 */ 
    23 public class TimelineTickPanel extends JPanel 
     23public class IncidentTimelineTickPanel extends JPanel 
    2424{ 
    2525 
    … …  
    8282     * Constructor. Set up the mouse listener. 
    8383     */ 
    84     public TimelineTickPanel() 
     84    public IncidentTimelineTickPanel() 
    8585    { 
    8686        super(); 

  • trunk/src/scriptbuilder/gui/panels/IncidentsPanel.java

    r1 r53  
    2020    private SimulationScript script; 
    2121    private TimelineTickPanel timelineTickPanel; 
    22     private List<IncidentTimelinePanel> incidentPanels; 
    23     private List<IncidentNumberPanel> numberPanels; 
     22    private List<ScriptBuilderTimelinePanel> incidentPanels; 
     23    private List<ScriptBuilderNumberPanel> numberPanels; 
    2424 
    2525    /** 

  • trunk/src/scriptbuilder/gui/panels/ScriptBuilderNumberPanel.java

    r1 r53  
    2626 * @author Bryan McGuffin 
    2727 */ 
    28 public class IncidentNumberPanel extends JPanel 
     28public class ScriptBuilderNumberPanel extends JPanel 
    2929{ 
    3030 
    3131    ScriptIncident incident; 
    3232    boolean visible; 
    33     public boolean collapsed = false; 
    34     private static Image collapseImage = null, expandImage = null; 
    35  
    36     /** 
    37      * Get the icon to use for the "collapse" button. 
    38      * 
    39      * @return Collapse.png 
    40      */ 
    41     private static Image getCollapseImage() 
    42     { 
    43         if (collapseImage == null) 
    44         { 
    45             try 
    46             { 
    47                 collapseImage = ImageIO.read(images.Images.getImage("Collapse.png")); 
    48             } 
    49             catch (IOException ex) 
    50             { 
    51                 Logger.getLogger(IncidentNumberPanel.class.getName()).log(Level.SEVERE, null, ex); 
    52             } 
    53         } 
    54  
    55         return collapseImage; 
    56     } 
    57  
    58     /** 
    59      * Get the icon to use for the "expand" button. 
    60      * 
    61      * @return Expand.png 
    62      */ 
    63     private static Image getExpandImage() 
    64     { 
    65         if (expandImage == null) 
    66         { 
    67             try 
    68             { 
    69                 expandImage = ImageIO.read(images.Images.getImage("Expand.png")); 
    70             } 
    71             catch (IOException ex) 
    72             { 
    73                 Logger.getLogger(IncidentNumberPanel.class.getName()).log(Level.SEVERE, null, ex); 
    74             } 
    75         } 
    76  
    77         return expandImage; 
    78     } 
    7933 
    8034    /** 
    … …  
    8438    private class IncidentNumberMouseListener extends MouseInputAdapter 
    8539    { 
    86  
    87         private final Shape collapseExpandButtonShape 
    88                 = new Rectangle(ScriptBuilderGuiConstants.COLLEX_BUTTON_X, 
    89                         ScriptBuilderGuiConstants.COLLEX_BUTTON_Y, 
    90                         ScriptBuilderGuiConstants.COLLEX_BUTTON_WIDTH, 
    91                         ScriptBuilderGuiConstants.COLLEX_BUTTON_HEIGHT); 
    9240 
    9341        /** 
    … …  
    10048        public void mouseClicked(MouseEvent e) 
    10149        { 
    102             if (collapseExpandButtonShape.contains(e.getX(), e.getY())) 
    103             { 
    104                 incident.setCollapsed(!collapsed); 
    105             } 
     50 
    10651        } 
    10752    } 
    … …  
    11055     * Constructor. Sets up the mouse listener. 
    11156     */ 
    112     public IncidentNumberPanel() 
     57    public ScriptBuilderNumberPanel() 
    11358    { 
    11459        super(); 
    … …  
    13176        this.visible = incident != null; 
    13277 
    133         if (incident != null) 
    134         { 
    135             this.collapsed = incident.collapsed; 
    136         } 
    137  
    13878        Dimension newSize; 
    13979        if (visible) 
    14080        { 
    141             if (collapsed) 
    142             { 
    143                 newSize = new Dimension( 
    144                         ScriptBuilderGuiConstants.INCIDENT_NUMBER_WIDTH, 
    145                         ScriptBuilderGuiConstants.TIMELINE_COLLAPSED_HEIGHT); 
    146             } 
    147             else 
    148             { 
    149                 int mostEvents = 0; 
    150                 for (TimeSlice slice : incident.getSlices()) 
    151                 { 
    152                     if (slice.events.size() > mostEvents) 
    153                     { 
    154                         mostEvents = slice.events.size(); 
    155                     } 
    156                 } 
    15781 
    158                 newSize = new Dimension(ScriptBuilderGuiConstants.INCIDENT_NUMBER_WIDTH, 
    159                         ScriptBuilderGuiConstants.TIMELINE_COLLAPSED_HEIGHT 
    160                         + ScriptBuilderGuiConstants.SCRIPT_EVENT_ICON_STEP * (mostEvents + 1)); 
    161             } 
     82            newSize = new Dimension(ScriptBuilderGuiConstants.INCIDENT_NUMBER_WIDTH, 
     83                    ScriptBuilderGuiConstants.TIMELINE_COLLAPSED_HEIGHT 
     84                    + ScriptBuilderGuiConstants.SCRIPT_EVENT_ICON_STEP * 2); 
     85 
    16286        } 
    16387        else 
    … …  
    198122                ScriptBuilderGuiConstants.INCIDENT_NUMBER_TOP_MARGIN); 
    199123 
    200         g2d.drawImage((collapsed ? getExpandImage() : getCollapseImage()), 
    201                 ScriptBuilderGuiConstants.COLLEX_BUTTON_X, 
    202                 ScriptBuilderGuiConstants.COLLEX_BUTTON_Y, null); 
     124        int y = ScriptBuilderGuiConstants.INCIDENT_NUMBER_TOP_MARGIN * 2 - 14; 
     125        g2d.setFont(ScriptBuilderGuiConstants.INCIDENT_NAME_FONT); 
     126        for (String line : incident.name.split(" ")) 
     127        { 
     128            g2d.drawString(line, 20, y); 
     129            y += 12; 
     130        } 
    203131 
    204         if (!collapsed) 
    205         { 
    206             int y = ScriptBuilderGuiConstants.INCIDENT_NUMBER_TOP_MARGIN * 2 - 14; 
    207             g2d.setFont(ScriptBuilderGuiConstants.INCIDENT_NAME_FONT); 
    208             for (String line : incident.name.split(" ")) 
    209             { 
    210                 g2d.drawString(line, 20, y); 
    211                 y += 12; 
    212             } 
    213         } 
    214132    } 
    215133} 

  • trunk/src/scriptbuilder/gui/panels/ScriptBuilderTimelinePanel.java

    r49 r53  
    2929 * @version 2017/06/30 
    3030 */ 
    31 public class IncidentTimelinePanel extends JPanel 
     31public class ScriptBuilderTimelinePanel extends JPanel 
    3232{ 
    3333 
    … …  
    3939     * If true, this panel is in its minimized state. 
    4040     */ 
    41     boolean collapsed; 
     41    //boolean collapsed; 
    4242    /** 
    4343     * If false, this panel won't be drawn. 
    … …  
    198198                    lastSlice = newSlice; 
    199199                    String newToolTip; 
    200                     if (collapsed) 
    201                     { 
    202                         newToolTip = incident.slices.get(newSlice).toString(); 
    203                     } 
    204                     else 
    205                     { 
    206                         newToolTip = incident.slices.get(newSlice).getToolTipText(y); 
    207                     } 
     200 
     201                    newToolTip = incident.slices.get(newSlice).toString(); 
     202 
    208203                    setToolTipText((newToolTip == null || newToolTip.equals("")) 
    209204                            ? null : newToolTip); 
    … …  
    218213     * Constructor. Generates a HashMap of all possible event types. 
    219214     */ 
    220     public IncidentTimelinePanel() 
     215    public ScriptBuilderTimelinePanel() 
    221216    { 
    222217        super(); 
    … …  
    258253    { 
    259254        this.incident = incident; 
    260         if (incident != null) 
    261         { 
    262             this.collapsed = incident.collapsed; 
    263         } 
    264255        this.visible = incident != null; 
    265256 
    … …  
    267258        if (visible) 
    268259        { 
    269             if (collapsed) 
    270             { 
    271                 newSize = new Dimension((incident.length + incident.offset) 
    272                         / ScriptBuilderGuiConstants.HORIZONTAL_TICK_RESOLUTION 
    273                         * ScriptBuilderGuiConstants.PIXEL_WIDTH_PER_HORIZONTAL_TICK, 
    274                         ScriptBuilderGuiConstants.TIMELINE_COLLAPSED_HEIGHT); 
    275             } 
    276             else 
    277             { 
    278                 int mostEvents = 0; 
    279                 for (TimeSlice slice : incident.getSlices()) 
    280                 { 
    281                     if (slice.events.size() > mostEvents) 
    282                     { 
    283                         mostEvents = slice.events.size(); 
    284                     } 
    285                 } 
    286  
    287                 newSize = new Dimension((ScriptBuilderGuiConstants.MAX_SIMULATION_LENGTH) 
    288                         / ScriptBuilderGuiConstants.HORIZONTAL_TICK_RESOLUTION 
    289                         * ScriptBuilderGuiConstants.PIXEL_WIDTH_PER_HORIZONTAL_TICK, 
    290                         ScriptBuilderGuiConstants.TIMELINE_COLLAPSED_HEIGHT 
    291                         + ScriptBuilderGuiConstants.SCRIPT_EVENT_ICON_STEP * (mostEvents + 1)); 
    292             } 
     260 
     261            newSize = new Dimension(((incident.length + incident.offset) 
     262                    / ScriptBuilderGuiConstants.HORIZONTAL_TICK_RESOLUTION 
     263                    * ScriptBuilderGuiConstants.PIXEL_WIDTH_PER_HORIZONTAL_TICK) 
     264                    + ScriptBuilderGuiConstants.EVENT_ICON_WIDTH, 
     265                    ScriptBuilderGuiConstants.TIMELINE_COLLAPSED_HEIGHT 
     266                    + ScriptBuilderGuiConstants.SCRIPT_EVENT_ICON_STEP * 2); 
     267 
    293268        } 
    294269        else 
    … …  
    319294 
    320295        Graphics2D g2d = (Graphics2D) g; 
    321         IncidentTimelineDrawer.DrawIncidentTimeline(g2d, incident, collapsed); 
     296        IncidentTimelineDrawer.DrawScriptBuilderTimeline(g2d, incident); 
    322297 
    323298        if (focused) 
Note: See TracChangeset for help on using the changeset viewer.