Changeset 6624

Timestamp:

11/19/10 13:47:07 (14 years ago)

Author:

Mathieu Morlighem

Message:

Much better plot_overlay (and simpler)

Location:

issm/trunk/src/m/model/plot

Files:

• applyoptions.m (modified) (1 diff)
• plot_overlay.m (modified) (3 diffs)

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

@@ -125 +125 @@
         elseif strcmpi(cname,'Rignot'),
                 c = hsv;
+
+                %adjust saturation
+                c = rgb2hsv(c);
+                alpha=getfieldvalue(options,'alpha',1);
+                c(:,2) = max(min( (0.1+c(:,1)).^(1/alpha) ,1),0);
+                c = hsv2rgb(c);
+
         else
                 c = cname;

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

@@ -60 +60 @@
 %options
 contrast=getfieldvalue(options,'contrast',1);  
-transparency=getfieldvalue(options,'alpha',1.5);  %Rignot's setting: 1.5
-data_coba=linspace(data_min,data_max,256);        %prepare colorbar (256 values between min and max)
+transparency=getfieldvalue(options,'alpha',1);
 data_grid(data_nan)=data_min; 
 
 %hue (H)
-h_data=bytscl(data_grid)/(255+1);           %scale between 0 and 1 (log applied in processdata)
-h_coba=bytscl(data_coba)/(255+1);           %scale between 0 and 1
+h_data=(data_grid-data_min)/(data_max-data_min);
 %saturation (S)
-s_data=(0.5+10.^data_grid/125)/transparency;s_data(find(s_data>1))=1;s_data(find(s_data<0))=0;
-s_coba=(0.5+10.^data_coba/125)/transparency;s_coba(find(s_coba>1))=1;s_coba(find(s_coba<0))=0;
+s_data=max(min((0.1+h_data).^(1/transparency),1),0);
 s_data(data_nan)=0;
 %intensity (V)
 radar=(md.sarpwr).^(contrast);
 v_data=radar/max(radar(:)); %For the principla image, use radar power as intensity
-v_coba=ones(256,1);         %For the colorbar: maximal intensity
 
 %}}}
@@ -83 +79 @@
 image_hsv(:,:,3)=v_data;
 image_rgb=hsv2rgb(image_hsv);
-colorbar_hsv=zeros(size(data_coba,2),size(data_coba,1),3);
-colorbar_hsv(:,:,1)=h_coba;
-colorbar_hsv(:,:,2)=s_coba;
-colorbar_hsv(:,:,3)=v_coba;
-colorbar_rgb=hsv2rgb(colorbar_hsv);
 %}}}
 
@@ -109 +100 @@
 
 %Apply options, without colorbar and without grid
-options=changefieldvalue(options,'colormap','hsv');            %We used an HSV colorbar
+options=changefieldvalue(options,'colormap','Rignot');         %We used an HSV colorbar
 options=changefieldvalue(options,'caxis',[data_min data_max]); %force caxis so that the colorbar is ready
 options=addfielddefault(options,'axis','equal off');           %default axis