Changeset 7651

Timestamp:

03/15/11 14:50:32 (14 years ago)

Author:

Eric.Larour

Message:

Can do 3d surface plots now in 2D, using the 'z' option

Location:

issm/trunk/src/m/model/plot

Files:

• applyoptions.m (modified) (1 diff)
• plot_manager.m (modified) (1 diff)
• plot_unit.m (modified) (1 diff)
• processmesh.m (modified) (1 diff)

issm/trunk/src/m/model/plot/applyoptions.m

@@ -69 +69 @@
         end
 end
+
+if exist(options,'z'),
+        axis square;
+end
+
 
 %xlim

issm/trunk/src/m/model/plot/plot_manager.m

@@ -173 +173 @@
 %plot unit
 h=plot_unit(x,y,z,elements,data2,is2d,datatype,options);
+        
 
 %apply all options

issm/trunk/src/m/model/plot/plot_unit.m

@@ -21 +21 @@
                 pos=find(~isnan(data)); %needed for element on water
                 if is2d,
-                        A=elements(pos,1); B=elements(pos,2); C=elements(pos,3); 
-                        h=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData', data(pos),'FaceColor','flat','EdgeColor',edgecolor);
+                        A=elements(pos,1); B=elements(pos,2); C=elements(pos,3); h=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData', data(pos),'FaceColor','flat','EdgeColor',edgecolor);
                 else
                         A=elements(pos,1); B=elements(pos,2); C=elements(pos,3); D=elements(pos,4); E=elements(pos,5); F=elements(pos,6);

issm/trunk/src/m/model/plot/processmesh.m

@@ -26 +26 @@
                 y2d=md.y2d;
         end
+
+        z_field=getfieldvalue(options,'z',md.z);
+        if ischar(z_field),
+                z=md.(z_field);
+        elseif isnumeric(z_field),
+                z=z_field;
+        else
                 z=md.z;
-                z2d=md.z2d;
-                elements2d=md.elements2d;
-                elements=md.elements;
-                elements_type2d=md.elements_type2d;
+        end
+
+
+        z2d=md.z2d;
+        elements2d=md.elements2d;
+        elements=md.elements;
+        elements_type2d=md.elements_type2d;
 
         %is it a 2d plot?