Changeset 8001

Timestamp:

04/21/11 07:34:15 (14 years ago)

Author:

Mathieu Morlighem

Message:

Moved inset to applyoptions (more general)
Added 'offsetaxispos' option to get more space
Posting for gridded plot has a default value
Clipped text so that it does not appear if outside of the box

Location:

issm/trunk/src/m/model/plot

Files:

• applyoptions.m (modified) (6 diffs)
• plot_gridded.m (modified) (4 diffs)
• plot_manager.m (modified) (1 diff)
• plot_unit.m (modified) (1 diff)
• plotdoc.m (modified) (1 diff)

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

@@ -284 +284 @@
                 textpositioni=textposition{i};
                 textrotationi=textrotation{i};
-                text(textpositioni(1),textpositioni(2),textstringi,'FontSize',textsizei,'FontWeight',textweighti,'Color',textcolori,'Rotation',textrotationi);
+                h=text(textpositioni(1),textpositioni(2),textstringi,'FontSize',textsizei,'FontWeight',textweighti,'Color',textcolori,'Rotation',textrotationi);
+                set(h,'Clipping','on'); %prevent text from appearing outside of the box
         end
 end
@@ -326 +327 @@
 if exist(options,'ytick'),
         set(gca,'ytick',getfieldvalue(options,'ytick'));
+end
+
+%Axis positions
+if exist(options,'offsetaxispos'),
+        offset=getfieldvalue(options,'offsetaxispos');
+        P=get(gca,'pos');
+        P(1)=P(1)+offset(1);
+        P(2)=P(2)+offset(2);
+        P(3)=P(3)+offset(3);
+        P(3)=P(4)+offset(4);
+        set(gca,'pos',P);
 end
 
@@ -339 +351 @@
                         set(gcf,'Position',[756    62   827   504]);
                 elseif strcmpi(figposition,'mathieu'),
-                        set(gcf,'Position',[1 1 1580 1150]);
+                        set(gcf,'Position',[300 1 1580 1150]);
                 elseif strcmpi(figposition,'fullscreen'),
                         set(gcf,'Position',get(0,'ScreenSize'));
@@ -378 +390 @@
 %showregion
 if strcmpi(getfieldvalue(options,'showregion','off'),'on'),
+        %Keep pointer of main axis
+        maingca=gca;
         %get inset relative position (x,y,width,height)
         insetpos=getfieldvalue(options,'insetpos',[0.02 0.70 0.18 0.18]);
         %get current plos position
-        cplotpos=get(gca,'pos');
+        cplotpos=get(maingca,'pos');
         %compute inset position
         PosInset=[cplotpos(1)+insetpos(1)*cplotpos(3),cplotpos(2)+insetpos(2)*cplotpos(4), insetpos(3)*cplotpos(3), insetpos(4)*cplotpos(4)];
@@ -408 +422 @@
         patch( [mdx(1) mdx(2) mdx(2) mdx(1)],[mdy(1) mdy(1) mdy(2) mdy(2)],ones(4,1),'EdgeColor',[0 0 0],'FaceColor','r','FaceAlpha',0.5)
         colorbar('off');
+        %back to main gca
+        set(gcf,'CurrentAxes',maingca)
 end
 
@@ -434 +450 @@
         light('Position',[0 0.1 0.1],'Style','infinite');
 end
+
+%========================%
+%OK VERY LAST STEP: INSET|
+%========================%
+if exist(options,'inset'),
+
+        %Keep pointer of main axis
+        maingca=gca;
+        %get inset relative position (x,y,width,height)
+        insetpos=getfieldvalue(options,'insetpos',[0.56 0.55 0.35 0.35]);
+        %get current plot position
+        cplotpos=get(gca,'pos');
+        %compute inset position
+        PosInset=[cplotpos(1)+insetpos(1)*cplotpos(3),cplotpos(2)+insetpos(2)*cplotpos(4), insetpos(3)*cplotpos(3), insetpos(4)*cplotpos(4)];
+        %show pos
+        X1=getfieldvalue(options,'insetx',xlim);
+        Y1=getfieldvalue(options,'insety',ylim);
+        if strcmpi(getfieldvalue(options,'showinset','off'),'on')
+                line(X1([1 2 2 1 1]),Y1([1 1 2 2 1]),zeros(1,5),'Color','k','LineWidth',2);
+        end
+
+        %Get current figure
+        ax1=gca;
+
+        %plot inset
+        axes('pos',PosInset);
+        copyobj(get(ax1,'children'),gca);
+        patch('Faces',[1 2 3 4 1],'Vertices',[X1([1 2 2 1])' Y1([1 1 2 2])'],'FaceColor','None','EdgeColor','k','LineWidth',2);
+
+        %applay options
+        options=removefield(options,'text',0);
+        options=removefield(options,'inset',0);
+        options=removefield(options,'offsetaxispos',0);
+        options=removefield(options,'showregion',0);
+        options=changefieldvalue(options,'colorbar',0);
+        options=changefieldvalue(options,'latlon','off');
+        options=changefieldvalue(options,'axis','equal off');
+        options=changefieldvalue(options,'xlim',getfieldvalue(options,'insetx',xlim));
+        options=changefieldvalue(options,'ylim',getfieldvalue(options,'insety',ylim));
+        applyoptions(md,data,options);
+
+        %back to main gca
+        set(gcf,'CurrentAxes',maingca)
+end

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

@@ -9 +9 @@
 %process mesh and data
 [x y z elements is2d]=processmesh(md,[],options);
+[data datatype]=processdata(md,data,options);
 
 %check is2d
@@ -18 +19 @@
 xlim=getfieldvalue(options,'xlim',[min(x) max(x)]);
 ylim=getfieldvalue(options,'ylim',[min(y) max(y)]);
-post=getfieldvalue(options,'posting',500);
+post=getfieldvalue(options,'posting',diff(xlim)/1000);
 
 %Interpolating data on grid
@@ -34 +35 @@
         data_max=max(data_grid(:));
 end
-white  =data_min - (data_max-data_min)/60;
+white  =data_min - (data_max-data_min)/55;
 options=changefieldvalue(options,'caxis',[white data_max]);
 data_grid(isnan(data_grid))=white;
@@ -47 +48 @@
 %set(gca,'pos',P);
 
-%pcolor(xlim(1)+post/2:post:xlim(2)-post/2,ylim(1)+post/2:post:ylim(2)-post/2,data_grid);set(gca,'YDir','normal');
 %shading interp;
 h=imagesc(xlim,ylim,data_grid);set(gca,'YDir','normal');

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

@@ -190 +190 @@
 
 applyoptions(md,data2,options,h);
-
-%plot inset if requested
-if exist(options,'inset'),
-
-        %get inset relative position (x,y,width,height)
-        insetpos=getfieldvalue(options,'insetpos',[0.56 0.55 0.35 0.35]);
-        %get current plos position
-        cplotpos=get(gca,'pos');
-        %compute inset position
-        PosInset=[cplotpos(1)+insetpos(1)*cplotpos(3),cplotpos(2)+insetpos(2)*cplotpos(4), insetpos(3)*cplotpos(3), insetpos(4)*cplotpos(4)];
-        %show pos
-        X1=getfieldvalue(options,'insetx',[min(x) max(x)]);
-        Y1=getfieldvalue(options,'insety',[min(y) max(y)]);
-        if strcmpi(getfieldvalue(options,'showinset','off'),'on')
-                line(X1([1 2 2 1 1]),Y1([1 1 2 2 1]),zeros(1,5),'Color','k','LineWidth',2);
-        end
-
-        %plot inset
-        axes('pos',PosInset);
-        box('on')
-        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
-        h=plot_unit(x,y,z,elements,data2,is2d,datatype,options);
-
-        %applay options
-        options=changefieldvalue(options,'colorbar',0);
-        options=changefieldvalue(options,'text',{});
-        options=changefieldvalue(options,'latlon','off');
-        options=changefieldvalue(options,'axis','equal off');
-        options=changefieldvalue(options,'xlim',getfieldvalue(options,'insetx',[min(x) max(x)]));
-        options=changefieldvalue(options,'ylim',getfieldvalue(options,'insety',[min(y) max(y)]));
-        applyoptions(md,data2,options);
-end
 
 %do ground overlay on kml plot_unit? 

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

@@ -9 +9 @@
 %edgecolor
 edgecolor=getfieldvalue(options,'edgecolor','none');
-%P=get(gca,'pos')
-%P(3)=P(3)+0.04;
-%P(1)=P(1)-0.02;
-%set(gca,'pos',P);
 
 switch datatype,

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

@@ -140 +140 @@
 disp('                  hmin,hmax and hnint are the minimum, maximum and number of intervals of the histogram (optional)');
 disp('       ''figposition'': position of figure: ''fullscreen'', ''halfright'', ''halfleft'', ''portrait'', ''landscape'',... (hardcoded in applyoptions.m)');
+disp('       ''offsetaxispos'': offset of current axis position to get more space (ex: [-0.02 0  0.04 0])');
 disp('       ''hmin'': (numeric, minimum for histogram)');
 disp('       ''hmax'': (numeric, maximum for histogram)');