Changeset 844

Timestamp:

06/08/09 15:14:06 (16 years ago)

Author:

Mathieu Morlighem

Message:

some fixing in plots

Location:

issm/trunk/src/m

Files:

• classes/public/plot/applyoptions.m (modified) (2 diffs)
• classes/public/plot/parse_options.m (modified) (1 diff)
• classes/public/plot/plot_contour.m (modified) (1 diff)
• classes/public/plot/plot_overlay.m (modified) (1 diff)
• classes/public/plot/scaleruler.m (modified) (1 diff)
• classes/public/printmodel.m (modified) (1 diff)
• utils/Math/round_ice.m (moved) (moved from issm/trunk/src/m/utils/Miscellaneous/round_ice.m )

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

@@ -122 +122 @@
 end
 
-%axis
-if ~isnan(options_structure.axis)
-        eval(['axis ' options_structure.axis]);
-end
-
 %area
 if ~isnan(options_structure.area),
@@ -168 +163 @@
 end
 
+%axis
+if ~isnan(options_structure.axis)
+        eval(['axis ' options_structure.axis]);
+end
+
 %streamliness
 if iscell(options_structure.streamlines) | ~isnan(options_structure.streamlines),

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

@@ -594 +594 @@
                 Ly=max(md.y)-min(md.y);
                 %default values
-                scalerulervalues.value=[min(md.x)+1/8*Lx   min(md.y)+1/8*Ly   10^(ceil(log10(Lx)))/5 floor(Lx/100) 5];
+                scalerulervalues.value=[min(md.x)+6/8*Lx   min(md.y)+1/10*Ly   10^(ceil(log10(Lx)))/5 floor(Lx/100) 5];
         end
         options_struct.scaleruler=scalerulervalues.value;

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

@@ -233 +233 @@
 if (~strcmpi(options_structure.contourticks,'off') & ~isempty(c) & ~isempty(h))
         if ~isnan(options_structure.contourcolor)
-                clabel(c,h,'color',color);
+                clabel(c,h,'color',color,'FontSize',14);
         else
                 clabel(c,h);

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

@@ -108 +108 @@
 end
 if isnan(options_structure.colorbarpos),
-        options_structure.colorbarpos=[0.82 0.65 0.03 0.2];
+        options_structure.colorbarpos=[0.80 0.70 0.02 0.15];
 end
 iscolorbar=(options_structure.colorbar==1 | isnan(options_structure.colorbar));

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

@@ -52 +52 @@
         yt=Bu(2)+widthscale;
         if i~=numberofticks-1,
-                text(xt,yt,num2str(Tick/1000),'FontSize',13,'FontWeight','b');
+                text(xt,yt,num2str(round_ice(Tick/1000,3)),'FontSize',13,'FontWeight','b');
         end
 end
-text(xt,yt,[num2str(Tick/1000) ' km'],'FontSize',13,'FontWeight','b');
+text(xt,yt,[num2str(round_ice(Tick/1000,3)) ' km'],'FontSize',13,'FontWeight','b');

issm/trunk/src/m/classes/public/printmodel.m

@@ -7 +7 @@
 %      printmodel(filename,format)
 
+set(gcf,'Renderer','zbuffer'); %fixes a bug on Mac OS X (not needed in future Matlab version)
 frame=getframe();image=frame2im(frame);
 imwrite(image,filename,format);