Changeset 20436

Timestamp:

04/04/16 21:21:23 (9 years ago)

Author:

dlcheng

Message:

CHG (javascript): Adding support for movie timestamp displays.

File:

• issm/trunk-jpl/src/m/plot/plot_unit.js (modified) (5 diffs)

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

@@ -152 +152 @@
                                 var vertex = vec3.create();
                                 var magnitude;
+                                var timestamps = data[data.length-1];
 
                                 for(var i = 0; i < x.length; i++){
@@ -168 +169 @@
                                 });
                                 
-                                for(var i = 0; i < data.length-1; i++){
+                                for(var i = 0; i < data.length; i++){
                                         //Prevent evaluation of datasubarray min/max if caxis exists
                                         if (options.exist('caxis')) {
@@ -180 +181 @@
                                         datadelta = datamax - datamin;
 
-                                        //Precalculate arrays for each datasubarray
+                                        //Precalculate arrays for each datasubarray, trimming off timestamp value by using x.length instead of data[i].length
                                         texcoords[i] = [];
                                         texcoords[i].itemSize = 2;
@@ -196 +197 @@
                                 //Initialize movie loop
                                 node["movieInterval"] = 1000 / options.getfieldvalue('moviefps',5);
-                                node["movieLength"] = data.length-1;
+                                node["movieTimestamps"] = timestamps;
+                                node["movieLength"] = timestamps.length;
                                 node["movieFrame"] = 0;
-                                console.log(canvas["movieHandler"]);
-                                if (canvas["movieHandler"])     {
-                                        clearInterval(canvas["movieHandler"]);
-                                }
+                        
+                                if (canvas["movieHandler"])     clearInterval(canvas["movieHandler"]);
                                 canvas["movieHandler"] = setInterval(function () {
                                                 if (canvas["moviePlay"]) {
@@ -213 +213 @@
                                                                 }
                                                         }
-                                                        if (canvas["timeLabel"]) {
-                                                                canvas["timeLabel"].html(String(node["movieFrame"]) + "/" +  String(node["movieLength"] - 1));
-                                                        }
-                                                        if (canvas["progressBar"]) {
-                                                                canvas["progressBar"].slider("value", node["movieFrame"]);
-                                                        }
-                                                        var array = [node["arrays"][0],node["arrays"][1][node["movieFrame"]],node["arrays"][2]];
-                                                        node["buffers"] = initBuffers(gl,array);
+                                                        if (canvas["timeLabel"]) canvas["timeLabel"].html(String(node["movieTimestamps"][node["movieFrame"]]) + "/" +  String(node["movieTimestamps"][node["movieLength"]-1]));
+                                                        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"]);
-                                console.log(canvas["movieHandler"]);
                                 if (canvas["progressBar"]) {
                                         canvas["movieFrame"] = 0;