Changeset 6976

Timestamp:

01/06/11 13:47:17 (14 years ago)

Author:

Mathieu Morlighem

Message:

Addded light option

Location:

issm/trunk/src/m/model/plot

Files:

• applyoptions.m (modified) (3 diffs)
• plot_manager.m (modified) (3 diffs)
• plot_unit.m (modified) (4 diffs)

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

@@ -1 @@
-function applyoptions(md,data,options)
+function applyoptions(md,data,options,plothandle)
 %APPLYOPTIONS - apply the options to current plot
 %
@@ -138 +138 @@
                 c(:,2) = max(min( (0.1+c(:,1)).^(1/alpha) ,1),0);
                 c = hsv2rgb(c);
+
+        elseif strcmpi(cname,'Rignot2'),
+                c = hsv;
+
+                %adjust saturation
+                c = rgb2hsv(c);
+                alpha=getfieldvalue(options,'alpha',1);
+                c(:,2) = max(min( (0.1+c(:,1)).^(1/alpha) ,1),0);
+                c = hsv2rgb(c);
+
+                c=flipud(c);
 
         else
@@ -373 +384 @@
 %figurebackgrounbcolor
 set(gcf,'color',getfieldvalue(options,'figurebackgroundcolor','w'));
+
+%lighting
+if strcmpi(getfieldvalue(options,'light','off'),'on'),
+        set(plothandle,'FaceLighting','gouraud','FaceColor','interp','AmbientStrength',0.5);
+        light('Position',[0 0.1 0.1],'Style','infinite');
+end

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

@@ -166 +166 @@
 
 %plot unit
-plot_unit(x,y,z,elements,data2,is2d,datatype,options);
+h=plot_unit(x,y,z,elements,data2,is2d,datatype,options);
 
 %apply all options
@@ -176 +176 @@
 end
 
-applyoptions(md,data2,options);
+applyoptions(md,data2,options,h);
 
 %plot inset if requested
@@ -199 +199 @@
         patch('Faces',[1 2 3 4 1],'Vertices',[X1([1 2 2 1])' Y1([1 1 2 2])' -10^10*ones(4,1)],'FaceColor','w','EdgeColor','k');
         hold on
-        plot_unit(x,y,z,elements,data2,is2d,datatype,options);
+        h=plot_unit(x,y,z,elements,data2,is2d,datatype,options);
 
         %applay options

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

@@ -1 @@
-function plot_unit(x,y,z,elements,data,is2d,datatype,options)
+function h=plot_unit(x,y,z,elements,data,is2d,datatype,options)
 %PLOT_UNIT - unit plot, display data
 %
 %   Usage:
-%      plot_unit(x,y,z,elements,data,is2d,datatype,options);
+%      h=plot_unit(x,y,z,elements,data,is2d,datatype,options);
 %
 %   See also: PLOTMODEL, PLOT_MANAGER
@@ -22 +22 @@
                 if is2d,
                         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);
+                        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);
-                        patch( 'Faces', [A B C],  'Vertices', [x y z],'CData', data(pos),'FaceColor','flat','EdgeColor',edgecolor);
+                        h=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);
@@ -37 +37 @@
                 if is2d,
                         A=elements(:,1); B=elements(:,2); C=elements(:,3); 
-                        patch( 'Faces', [A B C], 'Vertices', [x y z],'FaceVertexCData', data(:),'FaceColor','interp','EdgeColor',edgecolor);
+                        h=patch( 'Faces', [A B C], 'Vertices', [x y z],'FaceVertexCData', data(:),'FaceColor','interp','EdgeColor',edgecolor);
                 else
                         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);
+                        h=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);
@@ -60 +60 @@
 
                 if is2d,
-                        patch( 'Faces',elements,'Vertices',[x y],'CData',data,'FaceColor','interp','EdgeColor',edgecolor);
+                        h=patch( 'Faces',elements,'Vertices',[x y],'CData',data,'FaceColor','interp','EdgeColor',edgecolor);
                 else
                         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],'CData', data,'FaceColor','interp','EdgeColor',edgecolor);
+                        h=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData', data,'FaceColor','interp','EdgeColor',edgecolor);
                         patch( 'Faces', [D E F], 'Vertices', [x y z],'CData', data,'FaceColor','interp','EdgeColor',edgecolor);
                         patch( 'Faces', [A B E D], 'Vertices', [x y z],'CData', data,'FaceColor','interp','EdgeColor',edgecolor);