Changeset 20796

Timestamp:

06/22/16 23:11:49 (9 years ago)

Author:

dlcheng

Message:

CHG (javascript): Fixing issue where changing movie slider while paused would not change plot.

File:

• issm/trunk-jpl/src/m/plot/plot_unit.js (modified) (1 diff)

issm/trunk-jpl/src/m/plot/plot_unit.js

@@ -245 +245 @@
                                 if (canvas["movieHandler"])     clearInterval(canvas["movieHandler"]);
                                 canvas["movieHandler"] = setInterval(function () {
+                                                node["movieFrame"] = canvas["movieFrame"];
                                                 if (canvas["moviePlay"]) {
-                                                        node["movieFrame"] = canvas["movieFrame"];
-                                                        if (canvas["movieIncrement"]) {
-                                                                if (canvas["movieReverse"]) {
-                                                                        node["movieFrame"] = (((node["movieFrame"] - 1) % node["movieLength"]) + node["movieLength"]) % node["movieLength"]; //Handle negative modulus
-                                                                }
-                                                                else {
-                                                                        node["movieFrame"] = (((node["movieFrame"] + 1) % node["movieLength"]) + node["movieLength"]) % node["movieLength"]; //Handle negative modulus
-                                                                }
+                                                        if (canvas["movieReverse"]) {
+                                                                node["movieFrame"] = (((node["movieFrame"] - 1) % node["movieLength"]) + node["movieLength"]) % node["movieLength"]; //Handle negative modulus
                                                         }
-                                                        if (canvas["timeLabel"]) canvas["timeLabel"].html(node["movieTimestamps"][node["movieFrame"]].toFixed(0) + " " + options.getfieldvalue("movietimeunit","yr"));
-                                                        if (canvas["progressBar"]) canvas["progressBar"].slider("value", node["movieFrame"]);
-                                                        node["buffers"] = initBuffers(gl,[node["arrays"][0],node["arrays"][1][node["movieFrame"]],node["arrays"][2]]);
-                                                        canvas["movieFrame"] = node["movieFrame"];
+                                                        else {
+                                                                node["movieFrame"] = (((node["movieFrame"] + 1) % node["movieLength"]) + node["movieLength"]) % node["movieLength"]; //Handle negative modulus
+                                                        }
                                                 }
+                                                if (canvas["timeLabel"]) canvas["timeLabel"].html(node["movieTimestamps"][node["movieFrame"]].toFixed(0) + " " + options.getfieldvalue("movietimeunit","yr"));
+                                                if (canvas["progressBar"]) canvas["progressBar"].slider("value", node["movieFrame"]);
+                                                node["buffers"] = initBuffers(gl,[node["arrays"][0],node["arrays"][1][node["movieFrame"]],node["arrays"][2]]);
+                                                canvas["movieFrame"] = node["movieFrame"];
                                         }, node["movieInterval"]);
                                 if (canvas["progressBar"]) {