Changeset 167 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder/structures/TimeSlice.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/TimeSlice.java (modified) (2 diffs)

trunk/src/scriptbuilder/structures/TimeSlice.java

@@ -320 +320 @@
         }
     }
+    //these two following functions should not be necessary.
     /**
      * this method removes an audioevent that corresponds to the input I_AudioEvent. NEEDS VERIFICATION
      */
     public void removeCorrespondingAudioEvent(I_AudioEvent comparisonEvent){
-        String id = comparisonEvent.getFileName().split("/")[1];
+        String id = comparisonEvent.getID();
         for(I_ScriptEvent event : events)
         {
             if(event instanceof AudioEvent)
             {
-                System.out.println("removed an audioevent \n" + ((AudioEvent)event).audioPath.split("/")[2].substring(0,((AudioEvent)event).audioPath.split("/")[2].length() - 4));
-                System.out.println(id);
-                System.out.println(id.equals(((AudioEvent)event).audioPath.split("/")[2].substring(0,((AudioEvent)event).audioPath.split("/")[2].length() - 4)));
-
-                if(id.equals(((AudioEvent)event).audioPath.split("/")[2].substring(0,((AudioEvent)event).audioPath.split("/")[2].length() - 4)))
+                if(id.equals(((AudioEvent) event).id))
                 {
                     System.out.println("the event was deleted");
@@ -342 +339 @@
         }
     }
-    public AudioEvent getCorrespondingAudioEvent(I_AudioEvent compariosonEvent)
-    {
-        String id = compariosonEvent.getFileName();
+    public AudioEvent getCorrespondingAudioEvent(I_AudioEvent comparisonEvent)
+    {
+        String id = comparisonEvent.getID();
         AudioEvent retVal = null;
         for(I_ScriptEvent event: events)
         {
-            if(event instanceof AudioEvent && ((AudioEvent)event).audioPath.split("/")[2].equals(id))
+            if(event instanceof AudioEvent && id.equals(((AudioEvent) event).id))
             {
                 retVal = (AudioEvent) event;