Changeset 19886

Timestamp:

12/12/15 20:17:07 (9 years ago)

Author:

dlcheng

Message:

CHG (javascript): Modifying accepted movie data format for js plots.

Location:

issm/trunk-jpl/src/m/plot

Files:

• plot_unit.js (modified) (7 diffs)
• webgl.js (modified) (2 diffs)

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

@@ -19 +19 @@
 
         //Process data and model
-        var meshresults;
-        if (data["1"] instanceof Float64Array) {
-                meshresults = processmesh(md,data["1"],options);
-        }
-        else {
-                meshresults = processmesh(md,data,options);
-        }
+        var meshresults = processmesh(md,data,options);
         var x = meshresults[0]; 
         var y = meshresults[1]; 
@@ -33 +27 @@
         var isplanet = meshresults[5];
         
-        var dataresults, data2, datatype;
-        if (data["1"] instanceof Float64Array) {
-                dataresults = processdata(md,data["1"],options);
-                data2 = dataresults[0]; 
-                datatype = dataresults[1];
-        }
-        else {
-                dataresults = processdata(md,data,options);
-                data2 = dataresults[0]; 
-                datatype = dataresults[1];
-        }
+        var     dataresults = processdata(md,data,options);
+        var     data2 = dataresults[0]; 
+        var     datatype = dataresults[1];
         //}}}
 
@@ -126 +112 @@
                                 var cmap=options.getfieldvalue('cmap','jet');
                                 //If handling movie data, compute vertices once and texcoords for each movie frame
-                                if (data["1"] instanceof Float64Array) {
+                                if (data[0] instanceof Float64Array) {
                                         for(var i = 0; i < x.length; i++){
                                                 vertices[vertices.length] = x[i];
@@ -132 +118 @@
                                                 vertices[vertices.length] = z[i];
                                         }       
-
-                                        var datasubarray;
+                                        //Transpose data to obtain column addressable data matrix
+                                        data = data[0].map(function(col, i) { 
+                                                return data.map(function(row) { 
+                                                        return row[i]
+                                                })
+                                        });
                                         for(var i = 0; i < data.length-1; i++){
                                                 //Prevent evaluation of datasubarray min/max if caxis exists
-                                                datasubarray = data[String(i+1)];
                                                 if (options.exist('caxis')) {
                                                         caxis = options.getfieldvalue('caxis');
                                                 }
                                                 else {
-                                                        caxis = [ArrayMin(datasubarray),ArrayMax(datasubarray)];
+                                                        caxis = [ArrayMin(data[i]),ArrayMax(data[i])];
                                                 }
                                                 datamin = caxis[0];
@@ -152 +141 @@
                                                 for(var j = 0; j < x.length; j++){
                                                         texcoords[i][texcoords[i].length] = 0.5;
-                                                        texcoords[i][texcoords[i].length] = (datasubarray[j] - datamin) / datadelta;
+                                                        texcoords[i][texcoords[i].length] = (data[i][j] - datamin) / datadelta;
                                                 }
                                         }
@@ -158 +147 @@
                                         //Initialize movie loop
                                         node["movieInterval"] = 1000 / options.getfieldvalue('moviefps',5);
-                                        node["movieLength"] = data.length;
+                                        node["movieLength"] = data[0].length;
                                         node["movieFrame"] = 0;
                                         node["movieHandler"] = function () {
@@ -210 +199 @@
         
         /*Initalize buffers: */
-        if (data["1"] instanceof Float64Array) {
+        if (data[0] instanceof Float64Array) {
                 node["arrays"] = [vertices, texcoords, indices];
                 node["buffers"] = initBuffers(gl,[node["arrays"][0],node["arrays"][1][0],node["arrays"][2]]);

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

@@ -357 +357 @@
 } //}}}
 function draw(gl,options,canvas,nodes) { //{{{
-
         // Set clear color to black, fully opaque
         var backgroundcolor=new RGBColor(options.getfieldvalue('backgroundcolor','white'));
@@ -370 +369 @@
         window.requestAnimationFrame(function(time) {draw(gl,options,canvas,nodes)});
         updateCameraMatrix(canvas);
+        
         var drawPassNumber = 2;
         for (var i = drawPassNumber - 1; i >= 0; i--) {