Changeset 12394

Timestamp:

06/08/12 15:40:45 (13 years ago)

Author:

Mathieu Morlighem

Message:

Simpler plot_overlay

File:

• issm/trunk-jpl/src/m/model/plot/plot_overlay.m (modified) (2 diffs)

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

@@ -114 +114 @@
         colorm = getcolormap(options);
         len    = size(colorm,1);
-        size(colorm)
 
         ind = ceil((len-1)*(data_grid-data_min)/(data_max - data_min + eps) +1);
         ind(find(ind>len))=len;
-        max(ind(:))
         image_rgb=zeros(size(data_grid,1),size(data_grid,2),3);
         r=colorm(:,1); image_rgb(:,:,1)=r(ind); clear r;
@@ -125 +123 @@
 
         %Now add radarmap
-        image_hsv=rgb2hsv(image_rgb);
         radar = (md.radaroverlay.pwr).^(contrast);
-        h=image_hsv(:,:,3);
-        h=h.*radar/max(radar(:));
-        image_hsv(:,:,3)=h;
-        s=image_hsv(:,:,2);
-        s(data_nan)=0;
-        image_hsv(:,:,2)=s;
-        v=image_hsv(:,:,3);
-        %pos=find(v==0);v(pos)=1; %Change background from black to white
-        image_hsv(:,:,3)=v;
-        image_rgb=hsv2rgb(image_hsv);
+        radar = radar/max(radar(:));
+        %pos=find(radar==0); %Change background from black to white
+        r = image_rgb(:,:,1).*radar;  r(data_nan) = radar(data_nan);  r(pos) = 1;  image_rgb(:,:,1) = r;  clear r;
+        g = image_rgb(:,:,2).*radar;  g(data_nan) = radar(data_nan);  g(pos) = 1;  image_rgb(:,:,2) = g;  clear g;
+        b = image_rgb(:,:,3).*radar;  b(data_nan) = radar(data_nan);  b(pos) = 1;  image_rgb(:,:,3) = b;  clear b;
 end