Changeset 6497

Timestamp:

11/04/10 10:24:55 (14 years ago)

Author:

Mathieu Morlighem

Message:

Better error message for negative logs and do close figure if an error occurs

Location:

issm/trunk/src/m/model/plot

Files:

• plotmodel.m (modified) (1 diff)
• processdata.m (modified) (2 diffs)

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

@@ -49 +49 @@
         set(gcf,'Renderer','zbuffer');
 
-        %Go through all data plottable
-        for i=1:numberofplots,
-
-                %call unit plot
-                plot_manager(md,options.list{i},subplotwidth,nlines,ncols,i);
-
+        %Go through all data plottable and close window if an error occurs
+        try,
+                for i=1:numberofplots,
+                        plot_manager(md,options.list{i},subplotwidth,nlines,ncols,i);
+                end
+        catch me,
+                figure(figurenumber),close;
+                rethrow(me);
         end
 else

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

@@ -125 +125 @@
         %log?
         if exist(options,'log'),
+                bounds=getfieldvalue(options,'caxis',[min(data(:)) max(data(:))]);
+                if any(data<=0) & min(bounds)<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'));
@@ -150 +154 @@
         %log?
         if exist(options,'log'),
+                bounds=getfieldvalue(options,'caxis',[min(data(:)) max(data(:))]);
+                if any(data<=0) & min(bounds)<=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'));
         end