Changeset 164 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder/structures

Timestamp:

12/04/2019 02:52:08 PM (6 years ago)

Author:

sdanthin

Message:

ScriptIncident?.java added if statement to create a correct AudioEvent? when an I_AudioEvent event is created.

File:

• trunk/src/scriptbuilder/structures/ScriptIncident.java (modified) (4 diffs)

trunk/src/scriptbuilder/structures/ScriptIncident.java

@@ -8 +8 @@
 import java.util.TreeMap;
 import scriptbuilder.structures.events.I_ScriptEvent;
+import scriptbuilder.structures.ScriptEvent.ScriptEventType;
+import scriptbuilder.structures.events.I_AudioEvent;
+import scriptbuilder.structures.events.AudioEvent;
 
 /**
@@ -71 +74 @@
      */
     public int eventCount = 0;
+    
+    public int audioEventCount = 0;
 
     public SimulationScript script;
@@ -285 +290 @@
         //Check to see if there's already a timeslice here
         TimeSlice t = slices.get(start);
+        //logic to check if the added event needs to also have an associated audio event.
+        
         //If not, make one; then, add the event to it
         if (t == null)
         {
             t = new TimeSlice(start, this);
-            t.addEvent(ev);
+            //t.addEvent(ev);
             slices.put(start, t);
         }
         else
         {
-            t.addEvent(ev);
+            //t.addEvent(ev);
+        }
+        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++;
@@ -524 +543 @@
         if (!(oldTime == 0 && newTime > oldTime))
         {
+            if(evt instanceof I_AudioEvent)
+            {
+                //todo: need to figure out how to remove the audioEvent tha corresponds with the 
+                this.slices.get(oldTime).removeCorrespondingAudioEvent((I_AudioEvent)evt);
+                //this.addNewEvent(evt,newTime)
+            }
             this.slices.get(oldTime).events.remove(evt);
             this.addNewEvent(evt, newTime);