Changeset 2709

Timestamp:

12/08/09 16:16:10 (15 years ago)

Author:

Mathieu Morlighem

Message:

fixed colorbar in overlay

Location:

issm/trunk/src/m/classes/public

Files:

• buildoverlaycolorbar.m (modified) (4 diffs)
• plot/plot_overlay.m (modified) (1 diff)

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

@@ -1 @@
-function colorbar_rgb=buildoverlaycolorbar(md,field,transparency);
+function colorbar_rgb=buildoverlaycolorbar(md,data,transparency);
 %BUILDOVERLAYCOLORBAR - creates the colorbar associated with an averlay plot option
 %
@@ -6 +6 @@
 %
 %   Usage:
-%      colorbar_rgb=buildoverlaycolorbar(md,field,transparency);
+%      colorbar_rgb=buildoverlaycolorbar(md,data,transparency);
 %
 %   Example:
@@ -14 +14 @@
 
 %recover results
-if isfield(struct(md),field)
-        data=eval(['md.' field ';']);
-else
-        data=field;
-end
-
-results=min(data):(max(data)-min(data))/256:max(data);
+results=max(1.5,min(data)):(max(data)-min(data))/256:max(data);
 
 %Build hsv color image from radar and results
@@ -28 +22 @@
 %hue
 %cut results under 1.5, and log
-results(find(results<1.5))=1.5;
+%results(find(results<1.5))=1.5;
 h=bytscl((results))/(255+1); %1 offset on colormap
 

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

@@ -124 +124 @@
         set(colorbar_image_handle,'CData',colorbar_rgb);
         set(colorbar_handle,'Position',getfieldvalue(options,'colorbarpos'));
+        set(colorbar_handle,'FontSize',getfieldvalue(options,'fontsize',14));
 
         %modify ticks.
-        data(find(data<1.5))=1.5;
         scalestring=get(colorbar_handle,'YTickLabel');
-        scalevalues=get(colorbar_handle,'YTick');
-        scaleminmax=caxis;
-        numvalues=length(scalevalues);
+        numvalues=length(get(colorbar_handle,'YTick'));
 
         scalestring=[];
+        scaleminmax=[max(min(data),1.5) max(data)];
         for i=1:numvalues,
-                fraction=(scalevalues(i)-scaleminmax(1))/(scaleminmax(2)-scaleminmax(1));
-                scalevalues(i)=round_ice(exp(min(log(data))+(max(log(data))-min(log(data)))*fraction),2);
+                fraction=(i-1)/(numvalues-1);
+                scalevalues(i)=round_ice(scaleminmax(1)+(scaleminmax(2)-scaleminmax(1))*fraction,2);
                 scalestring=[scalestring; sprintf('%8.4g',scalevalues(i))];
         end
         set(colorbar_handle,'YTickLabel',scalestring);
         set(colorbar_handle,'YColor','y');
-        set(colorbar_handle,'FontSize',getfieldvalue(options,'fontsize',14));
 end