Changeset 3547

Timestamp:

04/15/10 15:57:48 (15 years ago)

Author:

Mathieu Morlighem

Message:

colorbar legend on top

Location:

issm/trunk/src/m/classes/public/plot

Files:

• applyoptions.m (modified) (2 diffs)
• latlonoverlay.m (modified) (1 diff)
• plot_manager.m (modified) (2 diffs)
• plot_overlay.m (modified) (2 diffs)
• plot_unit.m (modified) (1 diff)
• plotdoc.m (modified) (1 diff)
• scaleruler.m (modified) (3 diffs)

issm/trunk/src/m/classes/public/plot/applyoptions.m

@@ -155 +155 @@
         if exist(options,'colorbartitle'),
                 backup=gca;
-                axes(c);lab=ylabel(getfieldvalue(options,'colorbartitle'));
-                set(lab,'Rotation',getfieldvalue(options,'colorbartitlerotation',-90));
+                axes(c);lab=title(getfieldvalue(options,'colorbartitle'),'Color',getfieldvalue(options,'FontColor','k'));
+                set(lab,'Rotation',getfieldvalue(options,'colorbartitlerotation',0));
                 set(lab,'VerticalAlignment','bottom');
                 axes(backup);
@@ -205 +205 @@
 %Scale ruler
 if exist(options,'scaleruler'),
-        scaleruler(getfieldvalue(options,'scaleruler'));
+        scaleruler(options);
 end
 

issm/trunk/src/m/classes/public/plot/latlonoverlay.m

@@ -19 +19 @@
 %1: latlon
 if ~iscell(latlon),
-        latstep=3;
-        lonstep=3;
-        resolution=0.1;
-        color=[1 1 1];
+        if ischar(latlon) & strcmpi(latlon,'on'),
+                latstep=3;
+                lonstep=3;
+                resolution=0.1;
+                color=[1 1 1];
+        else
+                return;
+        end
 else
         if length(latlon)<2

issm/trunk/src/m/classes/public/plot/plot_manager.m

@@ -159 +159 @@
         %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
+        if strcmpi(getfieldvalue(options,'showinset','off'),'on')
+                X1=getfieldvalue(options,'insetx',[min(x) max(x)]);
+                Y1=getfieldvalue(options,'insety',[min(y) max(y)]);
+                line(X1([1 2 2 1 1]),Y1([1 1 2 2 1]),zeros(1,5),'Color','k','LineWidth',2);
+        end
 
         %plot inset
@@ -168 +174 @@
         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)]));

issm/trunk/src/m/classes/public/plot/plot_overlay.m

@@ -106 +106 @@
 %P=get(gca,'pos');
 %P(3)=P(3)+0.05;
-%P(2)=P(2)+0.10;
+%P(2)=P(2)+0.08;
 %P(1)=P(1)-0.02;
 %set(gca,'pos',P);
@@ -155 +155 @@
         end
         set(colorbar_handle,'YTickLabel',scalestring);
-        set(colorbar_handle,'YColor','k');
+        set(colorbar_handle,'YColor',getfieldvalue(options,'FontColor','k'));
+        if exist(options,'colorbartitle'),
+                backup=gca;
+                axes(colorbar_handle);lab=title(getfieldvalue(options,'colorbartitle'),'Color',getfieldvalue(options,'FontColor','k'));
+                set(lab,'Rotation',getfieldvalue(options,'colorbartitlerotation',0));
+                set(lab,'VerticalAlignment','bottom');
+                axes(backup);
+        end
 end%}}}

issm/trunk/src/m/classes/public/plot/plot_unit.m

@@ -9 +9 @@
 %edgecolor
 edgecolor=getfieldvalue(options,'edgecolor','none');
+%P=get(gca,'pos');
+%P(3)=P(3)+0.05;
+%P(1)=P(1)-0.02;
+%set(gca,'pos',P);
 
 %regular plot

issm/trunk/src/m/classes/public/plot/plotdoc.m

@@ -76 +76 @@
 disp('       ''fontsize'': same as standard matlab option (normal: ''n'',bold: ''b'',light: ''l'',demi: ''d'')');
 disp('       ''fontweight'': same as standard matlab option (10,14,...)');
+disp('       ''fontcolor'': same as standard matlab option');
 disp('       ''highlight'': highlights certain grids or elements when using ''gridnumbering'' or ''elementnumbering'' or ''highlightgrids '' or ''highlightelements'' option');
 disp('       ''resolution'': resolution used by section value (array of type [horizontal_resolution vertical_resolution])');

issm/trunk/src/m/classes/public/plot/scaleruler.m

@@ -1 @@
-function scaleruler(structure)
+function scaleruler(options)
 %SCALERULER - overlay a scale ruler on current plot
 %
 %   Usage:
-%      scaleruler(structure)
+%      scaleruler(options)
+
+%get options
+structure=getfieldvalue(options,'scaleruler');
+fontsize=getfieldvalue(options,'fontsize',16);
 
 %Go through structure and fill missing arguments
@@ -28 +32 @@
 xt=Bu(1);
 yt=Bu(2)+2*widthscale;
-text(xt,yt,num2str(Tick),'FontSize',13,'FontWeight','b');
+text(xt,yt,num2str(Tick),'FontSize',fontsize,'FontWeight','b');
 
 %loope over the patches
@@ -52 +56 @@
         yt=Bu(2)+2*widthscale;
         if i~=numberofticks-1,
-                text(xt,yt,num2str(round_ice(Tick/1000,3)),'FontSize',13,'FontWeight','b');
+                text(xt,yt,num2str(round_ice(Tick/1000,3)),'FontSize',fontsize,'FontWeight','b');
         end
 end
-text(xt,yt,[num2str(round_ice(Tick/1000,3)) ' km'],'FontSize',13,'FontWeight','b');
+text(xt,yt,[num2str(round_ice(Tick/1000,3)) ' km'],'FontSize',fontsize,'FontWeight','b');