Changeset 22434 for issm/trunk-jpl/src/m/plot/plot_transient_movie.js

Timestamp:

02/20/18 16:27:26 (7 years ago)

Author:

dlcheng

Message:

CHG (JS): Updating js scripts.

File:

• issm/trunk-jpl/src/m/plot/plot_transient_movie.js (modified) (7 diffs)

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

@@ -21 +21 @@
                 for (var i in steps) {
                         dataresults = processdata(md, data[i], options);
-                        range[1] = Math.min(range[0], ArrayMin(dataresults[0]));
-                        range[2] = Math.max(range[1], ArrayMax(dataresults[0]));
+                        range[0] = Math.min(range[0], ArrayMin(dataresults[1]));
+                        range[1] = Math.max(range[1], ArrayMax(dataresults[1]));
                 }
                 datatype = dataresults[1];
@@ -31 +31 @@
         //Create unit node if it does not already exist
         if (!('unit' in canvas.nodes)) {
-                var     dataresults = processdata(md, data[i],options);
+                var     dataresults = processdata(md, data[0],options);
                 var     data2 = dataresults[0]; 
                 var     datatype = dataresults[1];
@@ -39 +39 @@
         }
         
-        //display movie
+        //Setup rendering node
         var node = canvas.nodes.unit;
         node.options = options;
@@ -46 +46 @@
         node.enabled = options.getfieldvalue('nodata', 'off') == 'off';
         node.log = options.getfieldvalue('log', false);
-        canvas.unitMovieData = data;
+        
+        //process data
+        var     dataresults;
+        var processedData = [];
+        for (var i in steps) {
+                dataresults = processdata(md, data[i].slice(), options);
+                processedData[i] = dataresults[0];
+        }
+        
+        //display movie
+        canvas.unitMovieData = processedData;
         canvas.animation.frame = 0;
         canvas.animation.handler = setInterval(function () {
@@ -53 +63 @@
                 if (canvas.animation.play) {
                         if (canvas.animation.increment) {
-                                if (frame > steps.length - 1) {
-                                        if (node.movieLoop) {
+                                if (frame >= steps.length - 1) {
+                                        if (canvas.animation.loop) {
                                                 frame = 0;
                                         }
@@ -69 +79 @@
                 //If frame has changed, update unit node and data marker display.
                 if (frame !== canvas.animation.lastFrame) {
-                        node.updateBuffer('Coords', data[frame]);
-                        canvas.unitData = data[frame];
+                        node.updateBuffer('Coords', processedData[frame]);
+                        canvas.unitData = processedData[frame];
                         if (canvas.dataMarkers.enabled) {
                                 updateMarker(canvas, false);
                         }
-                        if (canvas.progressBar) {
-                                canvas.progressBar.val(frame).slider('refresh');
+                        if (canvas.playbackSlider) {
+                                canvas.playbackSlider.val(frame).slider('refresh');
                         }
-                        if (canvas.timeLabel) {
-                                canvas.timeLabel.html(steps[frame].toFixed(0) + " " + options.getfieldvalue("movietimeunit","yr"));
+                        if (canvas.playbackTextProgress) {
+                                canvas.playbackTextProgress.html(steps[frame].toFixed(0) + " " + options.getfieldvalue("movietimeunit","yr"));
                         }
-                        if (!isEmptyOrUndefined(canvas.nodes.quiver)) {
+                        if (!VESL.Helpers.isEmptyOrUndefined(canvas.nodes.quiver)) {
                                 plot_quiver(md,options,canvas,false);
                         }
@@ -91 +101 @@
         
         //Update progress bar with new frame info.
-        if (canvas.progressBar) {
-                canvas.progressBar.val(canvas.animation.frame);
-                canvas.progressBar.attr('max', steps.length - 1);
-                canvas.progressBar.slider('refresh');
+        if (canvas.playbackSlider) {
+                canvas.playbackSlider.val(canvas.animation.frame);
+                canvas.playbackSlider.attr('max', steps.length - 1);
+                canvas.playbackSlider.slider('refresh');
         }