Changeset 11179

Timestamp:

01/23/12 14:07:04 (13 years ago)

Author:

Mathieu Morlighem

Message:

deal with inf in vector (overlay) and added plot none for radar image only

Location:

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

Files:

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

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

@@ -78 +78 @@
                         return;
                 case 'none',
-                        plot_none(md,options,nlines,ncols,i);
-                        return;
+                        if ~exist(options,'overlay'),
+                                plot_none(md,options,nlines,ncols,i);
+                                return;
+                        end
                 case 'penalties',
                         plot_penalties(md,options,subplotwidth,i);

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

@@ -50 +50 @@
 ncols =length(md.radaroverlay.x);
 disp('Interpolating data on grid...');
-[x_m y_m data_grid]=InterpFromMeshToGrid(elements,x/getfieldvalue(options,'unit',1),y/getfieldvalue(options,'unit',1),data,xmin,ymax,xspacing,yspacing,nlines,ncols,NaN);
+[x_m y_m data_grid]=InterpFromMeshToGrid(elements,x/getfieldvalue(options,'unit',1),y/getfieldvalue(options,'unit',1),...
+        data,xmin,ymax,xspacing,yspacing,nlines,ncols,NaN);
 
 %Process data_grid
+pos=find(isinf(data_grid));
+if ~isempty(pos),
+        disp('Warning: removing Infs from vector (probably log(0)?)');
+        data_grid(pos)=NaN;
+end
 if exist(options,'caxis'),
         caxis_opt=getfieldvalue(options,'caxis');
@@ -73 +79 @@
 if strcmpi(colorm,'Rignot'),
         %hue (H)
-        h_data=(data_grid-data_min)/(data_max-data_min);
+        h_data=(data_grid-data_min)/(data_max-data_min+eps);
         if radaronly,
                 h_data(:)=0;
@@ -81 +87 @@
 elseif strcmpi(colorm,'Seroussi'),
         %hue (H)
-        h_data=1-(data_grid-data_min)/(data_max-data_min)*0.7;
+        h_data=1-(data_grid-data_min)/(data_max-data_min+eps)*0.7;
         %h_data=(data_grid-data_min)/(data_max-data_min)*2/3;
         if radaronly,