Changeset 6563

Timestamp:

11/12/10 12:21:38 (14 years ago)

Author:

seroussi

Message:

Better log plots

Location:

issm/trunk/src/m/model/plot

Files:

• applyoptions.m (modified) (1 diff)
• plot_section.m (modified) (2 diffs)

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

@@ -156 +156 @@
         end
         if exist(options,'log'),
+                nlab=10;
                 logvalue=getfieldvalue(options,'log');
 
-                scalestring=get(c,'YTickLabel');
-                scalevalues=get(c,'YTick');
                 scaleminmax=caxis;
-                numvalues=length(scalevalues);
-
-                scalestring=[];
-                for i=1:numvalues,
-                        fraction=(scalevalues(i)-scaleminmax(1))/(scaleminmax(2)-scaleminmax(1));
-                        scalevalues(i)=round_ice(logvalue^scalevalues(i),2);
-                        scalestring=char(scalestring,sprintf('%4.4g',scalevalues(i)));
+                Min=min(scaleminmax);
+                Max=max(scaleminmax);
+                set(c,'YLim',[Min Max]); % set colorbar limits
+                set(c,'YTick',linspace(Min,Max,nlab));     % set tick mark locations
+
+                labels = cell(1,nlab);
+                tick_vals = linspace(exp(log(logvalue)*Min),exp(log(logvalue)*Max),nlab);
+                warning off MATLAB:log:logOfZero;
+                for i = 1:nlab
+                        labels{i} = sprintf('%-3g',tick_vals(i));
                 end
-                scalestring=scalestring(2:end,:);
-                set(c,'YTickLabel',scalestring);
+                warning on MATLAB:log:logOfZero;
+
+                % set tick label strings
+                set(c,'YTickLabel',labels);
         end
         if exist(options,'colorbartitle'),

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

@@ -27 +27 @@
 colorm=getfieldvalue(options,'colormap','jet');
 color=eval([ colorm '(numcurves);']);
+options=removefield(options,'colormap',0); %back to default colormap
 
 %Loop over number of curves
@@ -94 +95 @@
                 subplot(nlines,ncols,index1)
                 %subplot(1,3,[2 3])
-                if i==5,
+                if i==1,
                         plot(s,data_s,'-','color','k','LineWidth',getfieldvalue(options,'linewidth',1))
-                elseif i==1 | i==2 | i==3,
+                elseif i==2,
+                        plot(s,data_s,':','color',color(i,:),'LineWidth',getfieldvalue(options,'linewidth',1))
+                else
                         plot(s,data_s,'--','color',color(i,:),'LineWidth',getfieldvalue(options,'linewidth',1))
-                else
-                        plot(s,data_s,'-','color',color(i,:),'LineWidth',getfieldvalue(options,'linewidth',1))
                 end