Changeset 19905

Timestamp:

12/16/15 21:35:25 (9 years ago)

Author:

dlcheng

Message:

CHG (javascript): Fixing zooming behavior and removing extraneous code from plot_unit.

Location:

issm/trunk-jpl/src/m/plot

Files:

• plot_unit.js (modified) (2 diffs)
• webgl.js (modified) (1 diff)

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

@@ -62 +62 @@
                 //element plot {{{
                 case 1:
-
                         pos=ArrayFindNot(data,NaN); //needed for element on water
                         if (elements[0].length==6){ //prisms
-
-                                /*A=elements(pos,1); B=elements(pos,2); C=elements(pos,3); D=elements(pos,4); E=elements(pos,5); F=elements(pos,6);
-                                  patch( 'Faces', [A B C],  'Vertices', [x y z],'CData', data(pos),'FaceColor','flat','EdgeColor',edgecolor);
-                                  patch( 'Faces', [D E F],  'Vertices', [x y z],'CData', data(pos),'FaceColor','flat','EdgeColor',edgecolor);
-                                  patch( 'Faces', [A B E D],'Vertices', [x y z],'CData', data(pos),'FaceColor','flat','EdgeColor',edgecolor);
-                                  patch( 'Faces', [B E F C],'Vertices', [x y z],'CData', data(pos),'FaceColor','flat','EdgeColor',edgecolor);
-                                  patch( 'Faces', [C A D F],'Vertices', [x y z],'CData', data(pos),'FaceColor','flat','EdgeColor',edgecolor);
-                                  */
                         }
                         else if (elements[0].length==4){ //tetras
-                                /*A=elements(:,1); B=elements(:,2); C=elements(:,3); D=elements(:,4);
-                                  patch( 'Faces',[A B C],'Vertices', [x y z],'CData',data(pos),'FaceColor','flat','EdgeColor',edgecolor);
-                                  patch( 'Faces',[A B D],'Vertices', [x y z],'CData',data(pos),'FaceColor','flat','EdgeColor',edgecolor);
-                                  patch( 'Faces',[B C D],'Vertices', [x y z],'CData',data(pos),'FaceColor','flat','EdgeColor',edgecolor);
-                                  patch( 'Faces',[C A D],'Vertices', [x y z],'CData',data(pos),'FaceColor','flat','EdgeColor',edgecolor);*/
                         }
                         else{ //2D triangular elements
-                                
-                                /*A=elements(pos,1); B=elements(pos,2); C=elements(pos,3);
-                                  patch( 'Faces', [A B C], 'Vertices', [x y z],'CData', data(pos),'FaceColor','flat','EdgeColor',edgecolor);*/
                         }
                         break;
@@ -90 +73 @@
                 //node plot {{{
                 case 2:
-
                         if (elements[0].length==6){ //prisms
-                                /*A=elements(:,1); B=elements(:,2); C=elements(:,3); D=elements(:,4); E=elements(:,5); F=elements(:,6);
-                                  patch( 'Faces', [A B C],  'Vertices', [x y z],'FaceVertexCData', data(:),'FaceColor','interp','EdgeColor',edgecolor);
-                                  patch( 'Faces', [D E F],  'Vertices', [x y z],'FaceVertexCData', data(:),'FaceColor','interp','EdgeColor',edgecolor);
-                                  patch( 'Faces', [A B E D],'Vertices', [x y z],'FaceVertexCData', data(:),'FaceColor','interp','EdgeColor',edgecolor);
-                                  patch( 'Faces', [B E F C],'Vertices', [x y z],'FaceVertexCData', data(:),'FaceColor','interp','EdgeColor',edgecolor);
-                                  patch( 'Faces', [C A D F],'Vertices', [x y z],'FaceVertexCData', data(:),'FaceColor','interp','EdgeColor',edgecolor);*/
                         }
-                        else if (elements[0].length==4){//tetras
-                                /*A=elements(:,1); B=elements(:,2); C=elements(:,3); D=elements(:,4);
-                                  patch( 'Faces',[A B C],'Vertices', [x y z],'FaceVertexCData',data(:),'FaceColor','interp','EdgeColor',edgecolor);
-                                  patch( 'Faces',[A B D],'Vertices', [x y z],'FaceVertexCData',data(:),'FaceColor','interp','EdgeColor',edgecolor);
-                                  patch( 'Faces',[B C D],'Vertices', [x y z],'FaceVertexCData',data(:),'FaceColor','interp','EdgeColor',edgecolor);
-                                  patch( 'Faces',[C A D],'Vertices', [x y z],'FaceVertexCData',data(:),'FaceColor','interp','EdgeColor',edgecolor);*/
+                        else if (elements[0].length==4){ //tetras
                         }
                         else{ //triangular elements     

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

@@ -270 +270 @@
         var e = window.event || e; // old IE support
         var delta = 1/10 * clamp((e.scale || e.wheelDelta || -e.detail), -1, 1);
-        canvas.zoomFactor = clamp(canvas.zoomFactor + delta * canvas.zoomFactor,canvas.zoomBounds[0],canvas.zoomBounds[1]);
+        canvas.zoomFactor = clamp(canvas.zoomFactor - delta * canvas.zoomFactor, canvas.zoomBounds[1],canvas.zoomBounds[0]);
+        console.log(canvas.zoomFactor);
 } //}}}
 //}}}