Changeset 19760

Timestamp:

11/18/15 22:33:11 (9 years ago)

Author:

dlcheng

Message:

CHG: Adding plot_mesh capability for test101.html

Location:

issm/trunk-jpl/src/m/plot

Files:

• plot_manager.js (modified) (2 diffs)
• plot_mesh.js (added)
• plot_unit.js (modified) (4 diffs)

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

@@ -86 +86 @@
                                 break;
                         case 'mesh':
-                                plot_mesh(md,options,nlines,ncols,i);
+                                //plot_mesh(md,options,nlines,ncols,i);
+                                plot_mesh(md.mesh.x,md.mesh.y,[0.0],md.mesh.elements,2,options,canvas,gl);
                                 break;
                         case 'none':
@@ -207 +208 @@
         }
 
-        //process data and model
-    var meshresults = processmesh(md,data,options);
-        var x = meshresults[0]; 
-        var y = meshresults[1]; 
-        var z = meshresults[2]; 
-        var elements = meshresults[3]; 
-        var is2d = meshresults[4]; 
-        var isplanet = meshresults[5];
-
-        var dataresults = processdata(md,data,options);
-        var data2 = dataresults[0]; 
-        var datatype = dataresults[1];
-
-        //plot unit
-        plot_unit(x,y,z,elements,data2,is2d,isplanet,datatype,options,canvas,gl);
+        if (typeof data !== 'string'){
+                //process data and model
+                var meshresults = processmesh(md,data,options);
+                var x = meshresults[0]; 
+                var y = meshresults[1]; 
+                var z = meshresults[2]; 
+                var elements = meshresults[3]; 
+                var is2d = meshresults[4]; 
+                var isplanet = meshresults[5];
+                
+                var dataresults = processdata(md,data,options);
+                var data2 = dataresults[0]; 
+                var datatype = dataresults[1];
+
+                //plot unit
+                plot_unit(x,y,z,elements,data2,is2d,isplanet,datatype,options,canvas,gl);
+        }
 
         //apply all options

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

@@ -45 +45 @@
         switch(datatype){
 
-                //element plot
+                //element plot {{{
                 case 1:
 
@@ -72 +72 @@
                         }
                         break;
-
-                        //node plot
+                //}}}
+                //node plot {{{
                 case 2:
 
@@ -115 +115 @@
                         }
                         break;
-
-                        //quiver plot
+                //}}}
+                //quiver plot {{{
                 case 3:
 
@@ -126 +126 @@
                         }
 
+                //}}}
                 default:
-                                throw Error(sprintf("%s%i%s\n",'case ',datatype,' not supported'));
+                        throw Error(sprintf("%s%i%s\n",'case ',datatype,' not supported'));
         }