Changeset 132 in tmcsimulator-scriptbuilder for trunk


Ignore:
Timestamp:
10/23/2017 02:47:32 PM (9 years ago)
Author:
bmcguffin
Message:

Name of current working file is now visible in the title bar of the main window. If the user is working on a new file, "untitled1.xml" is displayed.

Default save file name for new files is "untitled1.xml". If the user names a file such that it doesn't end in .xml, the ".xml" suffix is added automatically.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Incidents/inc_189.xml

    r131 r132  
    118118<!ELEMENT SAMPLE_MESSAGE (CMS_LINE*)> 
    119119<!ELEMENT CMS_LINE (#PCDATA)>]> 
    120 <TMC_SCRIPT title="Full Simulation"><SCRIPT_EVENT><TIME_INDEX>00:00:00</TIME_INDEX> 
     120<TMC_SCRIPT title="Full Simulation"><SCRIPT_EVENT><TIME_INDEX>01:23:00</TIME_INDEX> 
    121121<INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT> 
    122122<CAD_DATA><MASTER_INC_NUM>145086SLO005</MASTER_INC_NUM> 
    … …  
    180180<MAINTENANCE_RADIO>No Maintenance needed on scene for this incident.</MAINTENANCE_RADIO> 
    181181</SCRIPT_EVENT> 
    182 <SCRIPT_EVENT><TIME_INDEX>00:02:00</TIME_INDEX> 
     182<SCRIPT_EVENT><TIME_INDEX>01:25:00</TIME_INDEX> 
    183183<INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT> 
    184184<CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>28-24 1097, PD 1097</DETAIL> 
    … …  
    194194</CHP_RADIO> 
    195195</SCRIPT_EVENT> 
    196 <SCRIPT_EVENT><TIME_INDEX>00:06:00</TIME_INDEX> 
     196<SCRIPT_EVENT><TIME_INDEX>01:29:00</TIME_INDEX> 
    197197<INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT> 
    198198<CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>28-19 ENRT FROM I-5 AT SND CYN, 28-13 ENRT FROM I-5 AT 133</DETAIL> 
    … …  
    215215</CHP_RADIO> 
    216216</SCRIPT_EVENT> 
    217 <SCRIPT_EVENT><TIME_INDEX>00:08:00</TIME_INDEX> 
     217<SCRIPT_EVENT><TIME_INDEX>01:31:00</TIME_INDEX> 
    218218<INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT> 
    219219<CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>28-11 ENRT FROM I405 AT BRISTOL, 28-07 ENRT FROM SR55 AT DYER</DETAIL> 
    … …  
    245245</ATMS_EVALUATION> 
    246246</SCRIPT_EVENT> 
    247 <SCRIPT_EVENT><TIME_INDEX>00:09:00</TIME_INDEX> 
     247<SCRIPT_EVENT><TIME_INDEX>01:32:00</TIME_INDEX> 
    248248<INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT> 
    249249<CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>PD CLOSING JEFFREY AND UNIV DR, SENDING NEGOTIATOR, REQ SIGALERT</DETAIL> 
    … …  
    267267</FACILITATOR_EVALUATION> 
    268268</SCRIPT_EVENT> 
    269 <SCRIPT_EVENT><TIME_INDEX>00:13:00</TIME_INDEX> 
     269<SCRIPT_EVENT><TIME_INDEX>01:36:00</TIME_INDEX> 
    270270<INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT> 
    271271<CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>28-13 1097, 10-23 28-19 B4 CLOSING NB LNS, 1039 DOT FOR SIGN TRUCKS</DETAIL> 
    … …  
    284284<MAINTENANCE_RADIO>Get TMT rolling.</MAINTENANCE_RADIO> 
    285285</SCRIPT_EVENT> 
    286 <SCRIPT_EVENT><TIME_INDEX>00:14:00</TIME_INDEX> 
     286<SCRIPT_EVENT><TIME_INDEX>01:37:00</TIME_INDEX> 
    287287<INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT> 
    288288<CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>28-11 1097, CLSNG DWN SB LNS AT CULVER DR OFFR</DETAIL> 
    … …  
    329329</CMS_EVALUATION> 
    330330</SCRIPT_EVENT> 
    331 <SCRIPT_EVENT><TIME_INDEX>00:15:00</TIME_INDEX> 
     331<SCRIPT_EVENT><TIME_INDEX>01:38:00</TIME_INDEX> 
    332332<INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT> 
    333333<CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>28-13, 28-19 SHUTTING DWN NB 405 LNS AT SAND CYN ST OFFR</DETAIL> 
    … …  
    370370</CMS_EVALUATION> 
    371371</SCRIPT_EVENT> 
    372 <SCRIPT_EVENT><TIME_INDEX>00:16:00</TIME_INDEX> 
     372<SCRIPT_EVENT><TIME_INDEX>01:39:00</TIME_INDEX> 
    373373<INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT> 
    374374<TELEPHONE><INSTRUCTOR Role="TV Reporter #1">Hello, this is Cameron Stevens at KNOW TV 2.</INSTRUCTOR> 
    … …  
    377377</TELEPHONE> 
    378378</SCRIPT_EVENT> 
    379 <SCRIPT_EVENT><TIME_INDEX>00:17:00</TIME_INDEX> 
     379<SCRIPT_EVENT><TIME_INDEX>01:40:00</TIME_INDEX> 
    380380<INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT> 
    381381<CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>28-07 1097 ASSTNG 28-11 CLSNG SB LNS AT CULVER OFFR</DETAIL> 
    … …  
    392392<TMT_RADIO>If no sign trucks have been requested yet, another phone call needs to be made from CHP Dispatch requesting them.</TMT_RADIO> 
    393393</SCRIPT_EVENT> 
    394 <SCRIPT_EVENT><TIME_INDEX>00:18:00</TIME_INDEX> 
     394<SCRIPT_EVENT><TIME_INDEX>01:41:00</TIME_INDEX> 
    395395<INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT> 
    396396<CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>28-S4 1097 I5 JEFFREY AVE ASSIST</DETAIL> 
    … …  
    410410</TELEPHONE> 
    411411</SCRIPT_EVENT> 
    412 <SCRIPT_EVENT><TIME_INDEX>00:20:00</TIME_INDEX> 
     412<SCRIPT_EVENT><TIME_INDEX>01:43:00</TIME_INDEX> 
    413413<INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT> 
    414414<CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>PD STTNG DETOURS, SB TRFFC OFF AT CULVER AVE, NB TRFFC OFF AT SAND CYN</DETAIL> 
    … …  
    430430</ACTIVITY_LOG_EVALUATION> 
    431431</SCRIPT_EVENT> 
    432 <SCRIPT_EVENT><TIME_INDEX>00:21:00</TIME_INDEX> 
     432<SCRIPT_EVENT><TIME_INDEX>01:44:00</TIME_INDEX> 
    433433<INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT> 
    434434<CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>NEGOTIATOR 1097</DETAIL> 
    … …  
    445445</ACTIVITY_LOG_EVALUATION> 
    446446</SCRIPT_EVENT> 
    447 <SCRIPT_EVENT><TIME_INDEX>00:22:00</TIME_INDEX> 
     447<SCRIPT_EVENT><TIME_INDEX>01:45:00</TIME_INDEX> 
    448448<INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT> 
    449449<CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>NB LNS SHUT DOWN</DETAIL> 
    … …  
    458458</CHP_RADIO> 
    459459</SCRIPT_EVENT> 
    460 <SCRIPT_EVENT><TIME_INDEX>00:23:00</TIME_INDEX> 
     460<SCRIPT_EVENT><TIME_INDEX>01:46:00</TIME_INDEX> 
    461461<INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT> 
    462462<CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>SUSP WON'T ALLOW NEGOTIATOR NEAR HIM</DETAIL> 
    … …  
    473473</ACTIVITY_LOG_EVALUATION> 
    474474</SCRIPT_EVENT> 
    475 <SCRIPT_EVENT><TIME_INDEX>00:24:00</TIME_INDEX> 
     475<SCRIPT_EVENT><TIME_INDEX>01:47:00</TIME_INDEX> 
    476476<INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT> 
    477477<CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>28-07 SB LNS SHUT DOWN</DETAIL> 
    … …  
    486486</CHP_RADIO> 
    487487</SCRIPT_EVENT> 
    488 <SCRIPT_EVENT><TIME_INDEX>00:27:00</TIME_INDEX> 
     488<SCRIPT_EVENT><TIME_INDEX>01:50:00</TIME_INDEX> 
    489489<INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT> 
    490490<CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>SUSP IS CALMING DOWN. BOMB SQD 1097</DETAIL> 
    … …  
    502502<TMT_RADIO>Call saying the sign trucks are 10-97. Queue update.</TMT_RADIO> 
    503503</SCRIPT_EVENT> 
    504 <SCRIPT_EVENT><TIME_INDEX>00:31:00</TIME_INDEX> 
     504<SCRIPT_EVENT><TIME_INDEX>01:54:00</TIME_INDEX> 
    505505<INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT> 
    506506<TELEPHONE><INSTRUCTOR Role="Mayor">"Hello, this is Mayor Krom of Irvine."</INSTRUCTOR> 
    … …  
    509509</TELEPHONE> 
    510510</SCRIPT_EVENT> 
    511 <SCRIPT_EVENT><TIME_INDEX>00:33:00</TIME_INDEX> 
     511<SCRIPT_EVENT><TIME_INDEX>01:56:00</TIME_INDEX> 
    512512<INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT> 
    513513<TMT_RADIO>Queue update</TMT_RADIO> 
    514514</SCRIPT_EVENT> 
    515 <SCRIPT_EVENT><TIME_INDEX>00:38:00</TIME_INDEX> 
     515<SCRIPT_EVENT><TIME_INDEX>02:01:00</TIME_INDEX> 
    516516<INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT> 
    517517<CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>NEGOTIATOR MAKING PROGRESS, SUSP MAY SURRENDER</DETAIL> 
    … …  
    526526</CHP_RADIO> 
    527527</SCRIPT_EVENT> 
    528 <SCRIPT_EVENT><TIME_INDEX>00:39:00</TIME_INDEX> 
     528<SCRIPT_EVENT><TIME_INDEX>02:02:00</TIME_INDEX> 
    529529<INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT> 
    530530<TELEPHONE><INSTRUCTOR Role="TV Reporter #2">"Hello, this is Fred Roppel at KNOW TV Channel 3."</INSTRUCTOR> 
    … …  
    539539</TELEPHONE> 
    540540</SCRIPT_EVENT> 
    541 <SCRIPT_EVENT><TIME_INDEX>00:42:00</TIME_INDEX> 
     541<SCRIPT_EVENT><TIME_INDEX>02:05:00</TIME_INDEX> 
    542542<INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT> 
    543543<TMT_RADIO>Queue Update</TMT_RADIO> 
    544544</SCRIPT_EVENT> 
    545 <SCRIPT_EVENT><TIME_INDEX>00:43:00</TIME_INDEX> 
     545<SCRIPT_EVENT><TIME_INDEX>02:06:00</TIME_INDEX> 
    546546<INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT> 
    547547<CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>MAN TRIED TO DETONATE THE DEVICE, BOMB DIDNT ACTIVATE, PD APPRHNDNG</DETAIL> 
    … …  
    556556</CHP_RADIO> 
    557557</SCRIPT_EVENT> 
    558 <SCRIPT_EVENT><TIME_INDEX>00:45:00</TIME_INDEX> 
     558<SCRIPT_EVENT><TIME_INDEX>02:08:00</TIME_INDEX> 
    559559<INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT> 
    560560<CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>SUSP IN CUSTODY, BOMB SQD INSPECTING BOMB</DETAIL> 
    … …  
    569569</CHP_RADIO> 
    570570</SCRIPT_EVENT> 
    571 <SCRIPT_EVENT><TIME_INDEX>00:46:00</TIME_INDEX> 
     571<SCRIPT_EVENT><TIME_INDEX>02:09:00</TIME_INDEX> 
    572572<INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT> 
    573573<TMT_RADIO>Queue update</TMT_RADIO> 
    574574</SCRIPT_EVENT> 
    575 <SCRIPT_EVENT><TIME_INDEX>00:51:00</TIME_INDEX> 
     575<SCRIPT_EVENT><TIME_INDEX>02:14:00</TIME_INDEX> 
    576576<INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT> 
    577577<CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>CODE A, BOMB DEFUSED, LNS BEING OPENED</DETAIL> 
    … …  
    597597<TMT_RADIO>Queue update</TMT_RADIO> 
    598598</SCRIPT_EVENT> 
    599 <SCRIPT_EVENT><TIME_INDEX>00:53:00</TIME_INDEX> 
     599<SCRIPT_EVENT><TIME_INDEX>02:16:00</TIME_INDEX> 
    600600<INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT> 
    601601<CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>SB LNS OPN 28-11 28-07 1098</DETAIL> 
    … …  
    626626</CMS_EVALUATION> 
    627627</SCRIPT_EVENT> 
    628 <SCRIPT_EVENT><TIME_INDEX>00:54:00</TIME_INDEX> 
     628<SCRIPT_EVENT><TIME_INDEX>02:17:00</TIME_INDEX> 
    629629<INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT> 
    630630<CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>NB LNS OPN 28-13 28-19 1098</DETAIL> 
    … …  
    653653</CMS_EVALUATION> 
    654654</SCRIPT_EVENT> 
    655 <SCRIPT_EVENT><TIME_INDEX>00:55:00</TIME_INDEX> 
     655<SCRIPT_EVENT><TIME_INDEX>02:18:00</TIME_INDEX> 
    656656<INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT> 
    657657<CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>28-24, 28-S4 1098 PD OPNNG OVRPASS</DETAIL> 
    … …  
    669669<TMT_RADIO>Queue update</TMT_RADIO> 
    670670</SCRIPT_EVENT> 
    671 <SCRIPT_EVENT><TIME_INDEX>01:00:00</TIME_INDEX> 
     671<SCRIPT_EVENT><TIME_INDEX>02:23:00</TIME_INDEX> 
    672672<INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT> 
    673673<TELEPHONE><INSTRUCTOR Role="TV Reporter #1">Hello, this is Cameron Stevens at KCLY Channel 11.</INSTRUCTOR> 
    … …  
    682682<MAINTENANCE_RADIO>TMT The traffic is near normal. I'm (we're) 1098.</MAINTENANCE_RADIO> 
    683683</SCRIPT_EVENT> 
    684 <SCRIPT_EVENT><TIME_INDEX>01:17:00</TIME_INDEX> 
     684<SCRIPT_EVENT><TIME_INDEX>02:40:00</TIME_INDEX> 
    685685<INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT> 
    686686<CMS_EVALUATION cmsID="86" type="remove"><LOCATION>TBD</LOCATION> 

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

    r128 r132  
    126126    private ArrayList<ScriptIncident> loadIncidentsFromFiles(String directoryName) 
    127127    { 
    128  
     128        String fs = System.getProperty("file.separator"); 
    129129        ArrayList<ScriptIncident> newList = new ArrayList<ScriptIncident>(); 
    130         File folder = new File(directoryName); 
     130        File folder = new File(""+System.getProperty("user.dir")+fs+directoryName); 
    131131 
    132132        File[] incidentFiles; 

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

    r129 r132  
    162162         */ 
    163163        // Set listener for scroll pane 
     164        String t = "Script Builder: "; 
     165        if (script.saveFile == null) 
     166        { 
     167            t += "untitled1.xml"; 
     168        } 
     169        else 
     170        { 
     171            t += script.saveFile.getName(); 
     172        } 
     173        this.setTitle(t); 
    164174        AdjustmentListener listener = new MyAdjustmentListener(); 
    165175        timelinesScrollPane.getHorizontalScrollBar().addAdjustmentListener(listener); 
    166176        timelinesScrollPane.getVerticalScrollBar().addAdjustmentListener(listener); 
    167177        repaint(); 
     178 
    168179    } 
    169180 
    … …  
    260271                / Math.max(script.absoluteLength(), ScriptBuilderGuiConstants.TICK_TIMELINE_SMALLEST_LENGTH)); 
    261272        zoomSlider.setMaximum(zoomSlider.getMinimum() + 20); 
     273        String t = "Script Builder: "; 
     274        if (script.saveFile == null) 
     275        { 
     276            t += "untitled1.xml"; 
     277        } 
     278        else 
     279        { 
     280            t += script.saveFile.getName(); 
     281        } 
     282        this.setTitle(t); 
    262283        repaint(); 
    263284    } 
    … …  
    17001721    private void fileSaveAsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_fileSaveAsActionPerformed 
    17011722        JFileChooser fc = new JFileChooser(); 
    1702  
     1723        boolean wasNull = false; 
     1724        if (script.saveFile == null) 
     1725        { 
     1726            wasNull = true; 
     1727            String fName = "untitled"; 
     1728            int untitledCount = 1; 
     1729            while (new File("" + fName + untitledCount + ".xml").exists()) 
     1730            { 
     1731                untitledCount++; 
     1732            } 
     1733            script.saveFile = new File("" + fName + untitledCount + ".xml"); 
     1734        } 
     1735 
     1736        fc.setSelectedFile(script.saveFile); 
    17031737        fc.setFileFilter(new ExtensionFileFilter("Simulation Script XML (.xml)", 
    17041738                new String[] 
    … …  
    17091743        if (fc.showSaveDialog(this) == JFileChooser.APPROVE_OPTION) 
    17101744        { 
    1711             script.saveScriptToFile(fc.getSelectedFile()); 
    1712             script.saveFile = fc.getSelectedFile(); 
    1713         } 
     1745            String filename = fc.getSelectedFile().toString(); 
     1746            if (!filename.endsWith(".xml")) 
     1747            { 
     1748                filename += ".xml"; 
     1749 
     1750            } 
     1751            script.saveScriptToFile(new File(filename)); 
     1752            script.saveFile = new File(filename); 
     1753        } 
     1754        else 
     1755        { 
     1756            if (wasNull) 
     1757            { 
     1758                script.saveFile = null; 
     1759            } 
     1760        } 
     1761        this.update(script, 0); 
    17141762    }//GEN-LAST:event_fileSaveAsActionPerformed 
    17151763 
    … …  
    18851933        } 
    18861934 
     1935        String fs = System.getProperty("file.separator"); 
    18871936        //Pick the file to save it to 
    18881937        JFileChooser fc = new JFileChooser(); 
     1938        fc.setSelectedFile(new File("" + System.getProperty("user.dir") + fs + "Incidents" + fs + "inc_" + inc.number + ".xml")); 
    18891939        fc.setFileFilter(new ExtensionFileFilter("Script Incident (.xml)", new String[] 
    18901940        { 
    … …  
    18931943        if (fc.showSaveDialog(this) == JFileChooser.APPROVE_OPTION) 
    18941944        { 
    1895             inc.saveIncidentToFile(fc.getSelectedFile()); 
     1945            String filename = fc.getSelectedFile().toString(); 
     1946            if (!filename.endsWith(".xml")) 
     1947            { 
     1948                filename += ".xml"; 
     1949 
     1950            } 
     1951            inc.saveIncidentToFile(new File(filename)); 
    18961952        } 
    18971953    }//GEN-LAST:event_saveIncidentActionPerformed 
Note: See TracChangeset for help on using the changeset viewer.