Changeset 415 in tmcsimulator for trunk/webapps/einotebook/scripts/Events.js

Timestamp:

06/18/2019 10:44:53 AM (7 years ago)

Author:

jdalbey

Message:

einotebook fix to #131

File:

• trunk/webapps/einotebook/scripts/Events.js (modified) (5 diffs)

trunk/webapps/einotebook/scripts/Events.js

@@ -304 +304 @@
  * Finds the Event that was last executed by based on given time.
  * @param time The time in seconds.
- * @return The last execute event if at least one event has executed; otherwise, null.
+ * @return The array of last execute event if at least one event has executed; otherwise, null.
  */
 function events_getLastExecutedEvent(time)
 {
-        var event = null;
+        // var event = null;
+        var event_arr = [];
         if (this.length == 0)
     {
@@ -317 +318 @@
         if (this.length == 1 && this[0].time.getSeconds() <= time)
         {
-                event = this[0];
+                event.push(this[0]);
         }
         else
@@ -323 +324 @@
                 //NOTE: remember that the events are maintained in ascending order by time
                 
-                // FOR each Event
+                // FOR each Event 
                 for (var i = 0; i < this.length - 1; i++)
                 {
@@ -330 +331 @@
                             this[i + 1].time.getSeconds() > time)
                         {
-                                event = this[i];
+                                event_arr.push(this[i]);
+                                /* traverse backward to check if there is an event happen at the same time 
+                                with the current event */
+                                var k = i - 1;
+                                while ( k>=0 && (this[k].time.getSeconds() == this[i].time.getSeconds())) {
+                                        event_arr.push(this[k]);
+                                        k--;
+                                }
                         }
                 }
@@ -337 +345 @@
                 if (this[this.length - 1].time.getSeconds() <= time)
                 {
-                        event = this[this.length - 1];
+                        event_arr.push(this[this.length - 1]);
                 }       
         }
         
-        return event;
-}
-
+        // return an array of event 
+        return event_arr;
+}
+