source: issm/oecreview/Archive/19101-20495/ISSM-19936-19937.diff@ 20498

Index: ../trunk-jpl/src/m/plot/webgl.js
===================================================================
--- ../trunk-jpl/src/m/plot/webgl.js    (revision 19936)
+++ ../trunk-jpl/src/m/plot/webgl.js    (revision 19937)
@@ -47,17 +47,17 @@
        canvas.controlsensitivity = 1;
 
        // Add event listeners for canvas
-       canvas.addEventListener("mousewheel", function (ev) {onZoom(ev,canvas)}, false);
-       canvas.addEventListener("DOMMouseScroll", function (ev) {onZoom(ev,canvas)}, false);
+       canvas.addEventListener("mousewheel", function (ev) {onZoom(ev,canvas,options)}, false);
+       canvas.addEventListener("DOMMouseScroll", function (ev) {onZoom(ev,canvas,options)}, false);
 
        var mc = new Hammer.Manager(canvas);
 
     mc.add(new Hammer.Pan({threshold:0, pointers:0}));
     mc.add(new Hammer.Pinch({threshold:0})).recognizeWith(mc.get('pan'));
 
-    mc.on("panstart panmove", function (ev) {onPan(ev,canvas);});
-    mc.on("pinchstart pinchmove", function (ev) {onPinch(ev,canvas);});
-       //mc.on("mousewheel DOMMouseScroll", function (ev) {onZoom(ev,canvas);});
+    mc.on("panstart panmove", function (ev) {onPan(ev,canvas,options);});
+    mc.on("pinchstart pinchmove", function (ev) {onPinch(ev,canvas,options);});
+       //mc.on("mousewheel DOMMouseScroll", function (ev) {onZoom(ev,canvas,options);});
        
        return gl;
 } //}}}
@@ -234,7 +234,7 @@
                '',
                'void main(void) {',
                '       if (uMaskEnabled && (vZCoord < uMaskHeight)) {',
-               '               gl_FragColor = uMaskColor;',
+               '               gl_FragColor = vec4(uMaskColor.xyz, uAlpha);',
                '       }',
                '       else {',
                '               gl_FragColor = vec4(texture2D(uColorSampler, vec2(vTextureCoord.s, vTextureCoord.t)).rgb, uAlpha);',
@@ -314,7 +314,7 @@
 } //}}}
 //}}}
 //{{{ Interface Functions
-function onPan(ev,canvas) { //{{{
+function onPan(ev,canvas,options) { //{{{
        ev.preventDefault();
        if (ev.type == 'panstart') {
                canvas.lastDeltaX = 0;
@@ -325,7 +325,6 @@
                var deltaY = (canvas.lastDeltaY - ev.deltaY) / canvas.clientHeight * canvas.zoomFactor * 2;
                
                canvas.translation[0] += Math.cos(radians(canvas.rotation[0])) * deltaX - Math.sin(radians(canvas.rotation[0])) * deltaY;
-               //console.log(Math.cos(radians(canvas.rotation[0])) * deltaX, Math.sin(radians(canvas.rotation[0])) * deltaY);
                canvas.translation[1] += Math.sin(radians(canvas.rotation[0])) * deltaX + Math.cos(radians(canvas.rotation[0])) * deltaY;
        }
        else {
@@ -343,23 +342,23 @@
        canvas.lastDeltaX = ev.deltaX;
        canvas.lastDeltaY = ev.deltaY;
        
-       console.log(canvas.rotation);
+       if (options.getfieldvalue('displayview','off') == 'on') console.log(canvas.rotation);
 } //}}}
-function onPinch(ev,canvas) { //{{{
+function onPinch(ev,canvas,options) { //{{{
        ev.preventDefault();
        if (ev.type == 'pinchstart') {
                canvas.zoomLast = canvas.zoomFactor;
        }
        else {
                canvas.zoomFactor = clamp(ev.scale * canvas.zoomLast, canvas.zoomBounds[1], canvas.zoomBounds[0]);
-               console.log(canvas.zoomFactor);
+               if (options.getfieldvalue('displayzoom','off') == 'on') console.log(canvas.zoomFactor);
        }
 } //}}}
-function onZoom(ev,canvas) { //{{{
+function onZoom(ev,canvas,options) { //{{{
        ev.preventDefault();
        var delta = 1/10 * clamp(ev.scale || ev.wheelDelta || -ev.detail, -1, 1);
        canvas.zoomFactor = clamp(canvas.zoomFactor - delta * canvas.zoomFactor, canvas.zoomBounds[1], canvas.zoomBounds[0]);
-       console.log(canvas.zoomFactor);
+       if (options.getfieldvalue('displayzoom','off') == 'on') console.log(canvas.zoomFactor);
 } //}}}
 //}}}
 //{{{ Drawing Functions
Index: ../trunk-jpl/src/m/classes/plotoptions.js
===================================================================
--- ../trunk-jpl/src/m/classes/plotoptions.js   (revision 19936)
+++ ../trunk-jpl/src/m/classes/plotoptions.js   (revision 19937)
@@ -148,9 +148,6 @@
                 //check that there is no duplicates
                 for (var i=0;i<numberofplots;i++) list[i].deleteduplicates();
 
-                //allocate canvasid automatically
-                for (var i=0;i<numberofplots;i++) list[i].addfield('canvasid',i);
-
                 //Get figure number (should be in options for subplot 1)
                 this.figurenumber=list[0].getfieldvalue('figure',1);
                 list[0].removefield('figure',0);