Changeset 195 in tmcsimulator-scriptbuilder

Timestamp:

01/20/2020 08:06:39 PM (6 years ago)

Author:

sdanthin

Message:

SimulationScript?.java now prepends a zero if the number of the incident is less than 0, and starts incidents at index 1.
ScriptIncident?.java modified where the ID is set to accommodate for the above logic. see #222

Location:

trunk/src/scriptbuilder/structures

Files:

• ScriptIncident.java (modified) (1 diff)
• SimulationScript.java (modified) (4 diffs)

trunk/src/scriptbuilder/structures/ScriptIncident.java

@@ -327 +327 @@
             if(((I_AudioEvent) ev).getID().equals(""))
             {
-                ((I_AudioEvent) ev).setID(number+Integer.toString(audioEventCount));
                 audioEventCount++;
+                //ternary expression here just prepends an extra 0 to the ID of the audioEvent if its eventcount is less than 10
+                ((I_AudioEvent) ev).setID(number+((audioEventCount<10)? "0"+Integer.toString(audioEventCount):Integer.toString(audioEventCount)));
+                
             }
             if(t.getCorrespondingAudioEvent((I_AudioEvent)ev)==null)

trunk/src/scriptbuilder/structures/SimulationScript.java

@@ -79 +79 @@
     private MyScriptHandler sh;
     
+    public final String audioDirectory = "Audio";
+
+    
     public boolean saved;
     
@@ -275 +278 @@
     private void createAudioDirectory(Path path){
         String separator = System.getProperty("file.separator");
-        File f = new File(path.toString()+separator+"audio");
+        File f = new File(path.toString()+separator+audioDirectory);
         if(!f.exists())
         {
@@ -286 +289 @@
             {
                 String name = ((Integer) i.number).toString();
-                File incidentFolder = new File(path.toString()+separator+"audio"+separator+name);
+                File incidentFolder = new File(path.toString()+separator+audioDirectory+separator+name);
                 if(!incidentFolder.exists())
                 {
@@ -307 +310 @@
                             String output = radioEvent.toScriptFile();
                             //optimally, this line should use the ID, but to account for files being read in, it needs to be the radiofile name
+                            System.out.println("Attempting to create file: "+ path.toString()+
+                                            separator+
+                                            audioDirectory+
+                                            separator+
+                                            name+
+                                            separator+
+                                            radioEvent.radioFile.replaceAll(".mp3","")+
+                                            ".txt");
                             File newAudioScript = new File(
                                     path.toString()+
                                             separator+
-                                            "Audio"+
+                                            audioDirectory+
                                             separator+
                                             name+