Changeset 12399

Timestamp:

06/11/12 13:50:02 (13 years ago)

Author:

Mathieu Morlighem

Message:

minor

Location:

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

Files:

• plot_overlay.m (modified) (6 diffs)
• subplotmodel.m (modified) (1 diff)

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

@@ -41 +41 @@
         md=radarpower(md,options);
 end
+contrast = getfieldvalue(options,'contrast',1);  
+radar = (md.radaroverlay.pwr).^(contrast);
+radar = radar/max(radar(:));
+%radar(find(radar==0))=1; %Change background from black to white
 
 %InterpFromMeshToGrid
@@ -53 +57 @@
         data,xmin,ymax,xspacing,yspacing,nlines,ncols,NaN);
 
-%Process data_grid
+%Process data_grid (For processing, it is better not to have nan)
 pos=find(isinf(data_grid));
 if ~isempty(pos),
@@ -70 +74 @@
 end
 data_nan=find(isnan(data_grid));
-
-%Generate HSV image
-contrast=getfieldvalue(options,'contrast',1);  
-transparency=getfieldvalue(options,'alpha',1);
 data_grid(data_nan)=data_min; 
 
+%Special colormaps that require hsv treatment
 colorm=getfieldvalue(options,'colormap','Rignot');
-
-%Special colormaps that require hsv treatment
 if strcmpi(colorm,'Rignot') | strcmpi(colorm,'Seroussi') | strcmpi(colorm,'redblue')
         if strcmpi(colorm,'Rignot'),
+                transparency=getfieldvalue(options,'alpha',1);
                 h=(data_grid-data_min)/(data_max-data_min+eps);
                 if radaronly, h(:)=0; end
                 s=max(min((0.1+h).^(1/transparency),1),0);
         elseif strcmpi(colorm,'Seroussi'),
+                transparency=getfieldvalue(options,'alpha',1);
                 h=1-(data_grid-data_min)/(data_max-data_min+eps)*0.7;
                 if radaronly, h(:)=0; end
@@ -96 +97 @@
                 error('colormap not supported yet. (''Rignot'' and ''redblue'' are the only cupported colormaps)');
         end
-
         %(S) Saturation is 0 in NaNs
         s(data_nan)=0;
-
         %(V) intensity is based on radar image
-        radar=(md.radaroverlay.pwr).^(contrast);
-        v=radar/max(radar(:)); %use radar power as intensity
-        %pos=find(v==0);v(pos)=1; %Change background from black to white
+        v=radar; %use radar power as intensity
 
         %Transform HSV to RGB
@@ -125 +122 @@
         radar = (md.radaroverlay.pwr).^(contrast);
         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;
@@ -146 +142 @@
 
 %Apply options, without colorbar and without grid
-options=changefieldvalue(options,'colormap',colorm);           %We used an HSV colorbar
+options=changefieldvalue(options,'colormap',colorm);              % We used an HSV colorbar
 if ~isnan(data_min),
-        options=changefieldvalue(options,'caxis',[data_min data_max]); %force caxis so that the colorbar is ready
+        options=changefieldvalue(options,'caxis',[data_min data_max]); % force caxis so that the colorbar is ready
 end
-options=addfielddefault(options,'axis','equal off');           %default axis
+options=addfielddefault(options,'axis','equal off');              % default axis
 applyoptions(md,data,options);
 drawnow

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

@@ -14 +14 @@
 hmargin = getfieldvalue(options,'hmargin',[.01 .01]);
 vmargin = getfieldvalue(options,'vmargin',[.01 .01]);
-
 
 height = (1-sum(vmargin)-(nlines-1)*gap(1))/nlines;