Changeset 20585

Timestamp:

04/30/16 18:46:15 (9 years ago)

Author:

dlcheng

Message:

CHG (javascript): Fixing plot_unit transient data not displaying. Adding support for edgecolor for mesh and quiver plots.

Location:

issm/trunk-jpl/src/m/plot

Files:

• plot_mesh.js (modified) (3 diffs)
• plot_quiver.js (modified) (3 diffs)
• plot_unit.js (modified) (1 diff)
• webgl.js (modified) (1 diff)

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

@@ -64 +64 @@
         node["drawMode"] = gl.LINES;
         node["drawOrder"] = 0;
-        node["maskEnabled"] = options.exist('mask');
-        node["maskHeight"] = options.getfieldvalue('maskheight',150.0)*options.getfieldvalue('heightscale',1);
-        node["maskColor"] = options.getfieldvalue('maskcolor',[0.0,0.0,1.0,1.0]);
+        node["maskEnabled"] = options.getfieldvalue('innermask','off') == 'on';
+        node["maskHeight"] = options.getfieldvalue('innermaskheight',150.0)*options.getfieldvalue('heightscale',1);
+        node["maskColor"] = options.getfieldvalue('innermaskcolor',[0.0,0.0,1.0,1.0]);
                                 
         //some defaults:
@@ -73 +73 @@
         //retrieve some options
         var linewidth=options.getfieldvalue('linewidth',1);
-        var edgecolor=options.getfieldvalue('edgecolor','black');
+        var edgecolor=new RGBColor(options.getfieldvalue('edgecolor','black'));
+        if (edgecolor.ok) edgecolor = [edgecolor.r/255.0, edgecolor.g/255.0, edgecolor.b/255.0, 1.0];
+        else throw Error(sprintf("s%s%s\n","initWebGL error message: cound not find out edgecolor color for curent canvas ",canvas));
 
         //node plot {{{
@@ -86 +88 @@
                 var vertex = vec3.create();
                 var magnitude;
-                var color = [0.0, 0.0, 0.0, 1.0];       
+                var color = edgecolor;
                 for(var i = 0; i < x.length; i++){
                         //Check for NaN values and remove from indices array as necessary, but preserve vertex array spacing

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

@@ -68 +68 @@
         node["useIndexBuffer"] = false;
         node["drawOrder"] = 0;
-        node["maskEnabled"] = options.exist('mask');
-        node["maskHeight"] = options.getfieldvalue('maskheight',150.0)*options.getfieldvalue('heightscale',1);
-        node["maskColor"] = options.getfieldvalue('maskcolor',[0.0,0.0,1.0,1.0]);
+        node["maskEnabled"] = options.getfieldvalue('innermask','off') == 'on';
+        node["maskHeight"] = options.getfieldvalue('innermaskheight',150.0)*options.getfieldvalue('heightscale',1);
+        node["maskColor"] = options.getfieldvalue('innermaskcolor',[0.0,0.0,1.0,1.0]);
                                 
         //some defaults:
@@ -77 +77 @@
         //retrieve some options
         var linewidth=options.getfieldvalue('linewidth',1);
-        var edgecolor=options.getfieldvalue('edgecolor',[0.0,0.0,0.0,1.0]); //have RGBColor switch with array color?
-        //var edgecolor=options.getfieldvalue('edgecolor','black'); //have RGBColor switch with array color?
+        
+        var edgecolor=new RGBColor(options.getfieldvalue('edgecolor','black'));
+        if (edgecolor.ok) edgecolor = [edgecolor.r/255.0, edgecolor.g/255.0, edgecolor.b/255.0, 1.0];
+        else throw Error(sprintf("s%s%s\n","initWebGL error message: cound not find out edgecolor color for curent canvas ",canvas));
 
         //node plot {{{
@@ -105 +107 @@
                         
                         xyz2 = vec3.fromValues(vx[i], vy[i], 0.0);
-                        magnitude = 100000.0; //mesh resolution
+                        magnitude = 1000.0; //mesh resolution
                         vec3.normalize(direction, xyz2);
                         vec3.scale(direction, direction, magnitude);

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

@@ -175 +175 @@
                                 for(var i = 0; i < x.length; i++){
                                         //Check for NaN values and remove from indices array as necessary, but preserve vertex array spacing
-                                        if (isNaN(x[i]) || isNaN(y[i]) || isNaN(z[i]) || isNaN(data[i])) {
+                                        if (isNaN(x[i]) || isNaN(y[i]) || isNaN(z[i]) || isNaN(data[i][0])) {
                                                 nanindices[i] = i;
                                                 vertices[vertices.length] = vertex[0];

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

@@ -498 +498 @@
         var gl = canvas.gl;
         var backgroundcolor = new RGBColor(options.getfieldvalue('backgroundcolor','lightcyan'));
-        if(backgroundcolor.ok){
-                gl.clearColor(backgroundcolor.r/255.0, backgroundcolor.g/255.0, backgroundcolor.b/255.0, 1.0);
-        }
+        if (backgroundcolor.ok) gl.clearColor(backgroundcolor.r/255.0, backgroundcolor.g/255.0, backgroundcolor.b/255.0, 1.0);
         else throw Error(sprintf("s%s%s\n","initWebGL error message: cound not find out background color for curent canvas ",canvas));