Changeset 167 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder/structures/ScriptIncident.java

Timestamp:

12/16/2019 03:55:46 PM (6 years ago)

Author:

sdanthin

Message:

TimeSlice?.java modified remove/getcorrespondingAudioEvent to work with ID system. CHPRadioEvent.java modified to implement setID and ids in the I_AudioEvent.java. ScriptIncident? "adding event" modified to account for ID system. AudioEvent? has ids added. Preliminary tests show working.

File:

• trunk/src/scriptbuilder/structures/ScriptIncident.java (modified) (1 diff)

trunk/src/scriptbuilder/structures/ScriptIncident.java

@@ -296 +296 @@
         {
             t = new TimeSlice(start, this);
-            //t.addEvent(ev);
             slices.put(start, t);
         }
-        else
-        {
-            //t.addEvent(ev);
+        
+        //checks if event to add is an I_AudioEvent and if the I_AudioEvent already has an AudioEvent to connect with it
+        if(ev instanceof I_AudioEvent && t.getCorrespondingAudioEvent((I_AudioEvent)ev)==null){
+            
+            AudioEvent audio = (AudioEvent) ScriptEvent.factoryByType(ScriptEventType.AUDIO_EVENT);
+            
+            //checks to see if there is already a filename in the I_AudioEvent, if so, set the AudioEvent ID. This is because the ID is not stored within the Script itself.
+            if(!((I_AudioEvent) ev).getFileName().equals(""))
+            {
+                ((I_AudioEvent) ev).setID(((I_AudioEvent) ev).getFileName());
+            }
+            // checks to see if the I_AudioEvent already has an ID or not, if not, set one based on the audioEventCount. 
+            if(((I_AudioEvent) ev).getID().equals(""))
+            {
+                ((I_AudioEvent) ev).setID(number+Integer.toString(audioEventCount));
+                audioEventCount++;
+            }
+            //sets AudioEvent id to id of I_AudioEvent
+            audio.id = ((I_AudioEvent) ev).getID();
+            //sets I_AudioEvent filename to the AudioEvent id
+            ((I_AudioEvent) ev).setFileName(audio.id);
+            //sets the file path of the AudioEvent based on its internal id
+            audio.setAudioFilePathRelative();
+            //adds AudioEvent to the timeslice
+            t.addEvent(audio);
+            
         }
         t.addEvent(ev);
-        if(ev instanceof I_AudioEvent){
-            //should make a path and a different filename fields for the file itself. Either that or deal with the string separation each time
-            //needs a check for when we move I_AudioEvents in the incident, as to not make duplicate events.
-            String fileName = number+"/"+number + "" + audioEventCount;
-            AudioEvent audio = (AudioEvent) ScriptEvent.factoryByType(ScriptEventType.AUDIO_EVENT);
-            ((I_AudioEvent) ev).setFileName(fileName);
-            audio.setAudioFilePathRelative(fileName);
-            
-            t.addEvent(audio);
-            audioEventCount++;
-        }
         eventCount++;