Changeset 25836 for issm/trunk/src/m/plot/plotmodel.m

Timestamp:

12/08/20 08:45:53 (4 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 25834

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/plot/plotmodel.m (modified) (5 diffs)

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

@@ -10 +10 @@
 
 %get number of subplots
-subplotwidth=ceil(sqrt(options.numberofplots));
+subplotwidth=ceil(sqrt(numberofplots));
 
 %if nlines and ncols specified, then bypass.
@@ -28 +28 @@
 end
 
+% Add option for subplot, only support one subplot per one plotmodel call
+subindex = 0;
+if (exist(options.list{1},'subplot'))
+    subops = getfieldvalue(options.list{1},'subplot',NaN);
+    nlines = subops(1);
+    ncols = subops(2);
+    subindex = subops(3);
+    % change the width
+    subplotwidth = ncols;
+    % Turn off new figure option for subplot
+    options.list{1}=addfield(options.list{1},'figurestatement','off');
+    % Turn off clf option for subplot
+    options.list{1}=addfield(options.list{1},'clf','off');
+end
+
 %go through subplots
 if numberofplots,
 
         %Create figure 
-        if strcmpi(getfieldvalue(options.list{1},'figurestatement','on'),'on'),
+        if (strcmpi(getfieldvalue(options.list{1},'figurestatement','on'),'on'))
                 f=figure(figurenumber); 
         else
@@ -89 +104 @@
         end % }}}
 
-        %Use zbuffer renderer (snoother colors) and white background
+        %Use zbuffer renderer (smoother colors) and white background
         set(f,'Renderer','zbuffer','color',getfieldvalue(options.list{1},'figurebackgroundcolor','w'));
 
@@ -95 +110 @@
         try,
                 for i=1:numberofplots,
-                        plot_manager(getfieldvalue(options.list{i},'model',md),options.list{i},subplotwidth,nlines,ncols,i);
-                        %List all unused options
+            if subindex
+                plot_manager(getfieldvalue(options.list{i},'model',md),options.list{i},subplotwidth,nlines,ncols,subindex);
+            else
+                plot_manager(getfieldvalue(options.list{i},'model',md),options.list{i},subplotwidth,nlines,ncols,i);
+            end
+            %List all unused options
                         if getfieldvalue(options.list{i},'displayunused',1),
                                 displayunused(options.list{i})
@@ -106 +125 @@
         end
 else
-        error('plotmodel error message: no output data found. ');
+        error('plotmodel error message: no output data found.');
 end