Changeset 21066

Timestamp:

08/04/16 08:33:40 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: better way to deal with caxis and log options

Location:

issm/trunk-jpl/src/m/plot

Files:

• checkplotoptions.m (modified) (1 diff)
• processdata.m (modified) (1 diff)

issm/trunk-jpl/src/m/plot/checkplotoptions.m

@@ -202 +202 @@
 if exist(options,'log'),
         if exist(options,'caxis')
+                options=addfield(options,'caxis_pre',getfieldvalue(options,'caxis'));
                 options=changefieldvalue(options,'caxis',log(getfieldvalue(options,'caxis'))/log(getfieldvalue(options,'log')));
         end

issm/trunk-jpl/src/m/plot/processdata.m

@@ -171 +171 @@
         %log?
         if exist(options,'log'),
-                %if any(data<=0),
-                %       error('Log option cannot be applied on negative values. Use caxis option (Rignot''s settings: [1.5 max(data)])');
-                %end
-                data=log(data)/log(getfieldvalue(options,'log'));
+                bounds=getfieldvalue(options,'caxis_pre',[min(data(:)) max(data(:))]);
+                data(find(data<bounds(1)))=bounds(1);
+                if any(data<=0),
+                        error('Log option cannot be applied on negative values. Use caxis option (Rignot''s settings: [1.5 max(data)])');
+                end
+                pos=find(~isnan(data));
+                data(pos)=log(data(pos))/log(getfieldvalue(options,'log'));
         end
 end