Changeset 19771

Timestamp:

11/20/15 12:05:30 (9 years ago)

Author:

dlcheng

Message:

CHG:Standardizing js plot api. Attempting fix to preven default zoom behavior on test101 canvases.

Location:

issm/trunk-jpl/src/m/plot

Files:

• plot_manager.js (modified) (3 diffs)
• plot_mesh.js (modified) (2 diffs)
• plot_unit.js (modified) (2 diffs)
• webgl.js (modified) (2 diffs)

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

@@ -16 +16 @@
         //standard plot: initialize open Gl for each canvas: 
         var canvas=document.getElementById(options.getfieldvalue('canvasid'));
+        //$.("<canvas id='"+options.getfieldvalue('canvasid')+"' width=640 height=480></canvas>)").append("body");
 
         // Initialize the GL context: 
@@ -87 +88 @@
                         case 'mesh':
                                 //plot_mesh(md,options,nlines,ncols,i);
-                                plot_mesh(md.mesh.x,md.mesh.y,[0.0],md.mesh.elements,2,options,canvas,gl);
+                                plot_mesh(md,options,canvas,gl);
                                 break;
                         case 'none':
@@ -209 +210 @@
 
         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);
+                plot_unit(md,data,options,canvas,gl);
         }
 

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

@@ -1 @@
-function plot_mesh(x,y,z,elements,datatype,options,canvas,gl) {
+function plot_mesh(md,options,canvas,gl) {
         //   Usage:
-        //      plot_mesh(md,options,nlines,ncols,i);
+        //      plot_mesh(md,options,canvas,gl);
         //
         //   See also: PLOTMODEL
@@ -15 +15 @@
         var zmin,zmax;
         var scale;
+        //Process data and model
+        var x = md.x;
+        var y = md.y;
+        var z = [0.0];
+        var elements = md.elements;
         //}}}
 

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

@@ -1 @@
-function plot_unit(x,y,z,elements,data,is2d,isplanet,datatype,options,canvas,gl) {
+function plot_unit(md,data,options,canvas,gl) {
         //PLOT_UNIT - unit plot, display data
         //
         //   Usage:
-        //      plot_unit(x,y,z,elements,data,is2d,isplanet,datatype,options);
+        //      plot_unit(md,data,options,canvas,gl);
         //
         //   See also: PLOTMODEL, PLOT_MANAGER
@@ -18 +18 @@
         var datamin,datamax;
         var scale;
+        //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];
         //}}}
 
         //Initialize the buffer structure: 
         node = Node(gl,options);
+
 
         //Compute coordinates and data range: 

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

@@ -41 +41 @@
                 canvas.addEventListener("DOMMouseScroll", function (e) {MouseWheelHandler(e,canvas)}, false);
                 // Mobile
-                //canvas.addEventListener("gesturechange", MousePinchHandler, false);
+                canvas.addEventListener("gesturechange", MouseWheelHandler, false);
         }
 
@@ -233 +233 @@
         // prevent scrolling when over canvas
         e.preventDefault();
-        var delta = 1/10 * clamp((e.wheelDelta || -e.detail), -1, 1);
+        var e = window.event || e; // old IE support
+        var delta = 1/10 * clamp((e.scale || e.wheelDelta || -e.detail), -1, 1);
         canvas.zoomFactor = canvas.zoomFactor + -delta * canvas.zoomFactor;
 } //}}}