Changeset 11892

Timestamp:

04/04/12 08:45:21 (13 years ago)

Author:

Mathieu Morlighem

Message:

Fixed plotoptions

File:

• issm/trunk-jpl/src/m/classes/plotoptions.m (modified) (7 diffs)

issm/trunk-jpl/src/m/classes/plotoptions.m

@@ -48 +48 @@
                          end
 
-                         %first: build a pairoptions out of varargin:
+                         %go through varargin and build list (like pairoptions)
                          rawoptions=pairoptions(varargin{:});
+                         numoptions = (nargin-1)/2;
+                         rawlist=cell(numoptions,2);
+                         for i=1:numoptions,
+                                 if ischar(varargin{2*i-1}),
+                                         rawlist{i,1}=varargin{2*i-1};
+                                         rawlist{i,2}=varargin{2*i};
+                                 else
+                                         %option is not a string, ignore it
+                                         disp(['WARNING: option number ' num2str(i) ' is not a string, it will be ignored']);
+                                         rawlist(i,:)=[];
+                                         continue
+                                 end
+                         end
 
                          %get figure number
@@ -72 +85 @@
 
                          %process plot options
-                         for i=1:size(rawoptions.list,1),
+                         for i=1:size(rawlist,1),
 
                                  %If alloptions flag has is on, apply to all plots
-                                 if (allflag & ~strcmpi(rawoptions.list{i,1},'data') & ~ismember('#',rawoptions.list{i,1})),
+                                 if (allflag & ~strcmpi(rawlist{i,1},'data') & ~ismember('#',rawlist{i,1})),
                                          for j=1:numberofplots,
-                                                 opt.list{j}=addfield(opt.list{j},rawoptions.list{i,1},rawoptions.list{i,2});
+                                                 opt.list{j}=addfield(opt.list{j},rawlist{i,1},rawlist{i,2});
                                          end
 
                                          %option contains '#'
-                                 elseif ismember('#',rawoptions.list{i,1}),
+                                 elseif ismember('#',rawlist{i,1}),
 
                                          %get suplot(s) associated
-                                         string=strsplit(rawoptions.list{i,1},'#');
+                                         string=strsplit(rawlist{i,1},'#');
                                          plotnums=string{end};
                                          field=string{1};
@@ -102 +115 @@
                                                  elseif strcmpi(plotnum,'all');
                                                          for j=1:numberofplots,
-                                                                 opt.list{j}=addfield(opt.list{j},field,rawoptions.list{i,2});
+                                                                 opt.list{j}=addfield(opt.list{j},field,rawlist{i,2});
                                                          end
 
@@ -113 +126 @@
                                                          end
                                                          for j=nums(1):nums(2),
-                                                                 opt.list{j}=addfield(opt.list{j},field,rawoptions.list{i,2});
+                                                                 opt.list{j}=addfield(opt.list{j},field,rawlist{i,2});
                                                          end
 
@@ -122 +135 @@
                                                                  error(['opt error message: ' field ' cannot be assigned (' plotnum ' exceed maximum number of plot)']);
                                                          end
-                                                         opt.list{str2num(plotnum)}=addfield(opt.list{str2num(plotnum)},field,rawoptions.list{i,2});
+                                                         opt.list{str2num(plotnum)}=addfield(opt.list{str2num(plotnum)},field,rawlist{i,2});
                                                  end
                                          end
@@ -132 +145 @@
                                          j=1;
                                          while (j<=numberofplots),
-                                                 if ~exist(opt.list{j},rawoptions.list{i,1});
-                                                         opt.list{j}=addfield(opt.list{j},rawoptions.list{i,1},rawoptions.list{i,2});
+                                                 if ~exist(opt.list{j},rawlist{i,1});
+                                                         opt.list{j}=addfield(opt.list{j},rawlist{i,1},rawlist{i,2});
                                                          break
                                                  else
@@ -140 +153 @@
                                          end
                                          if j>numberofplots,
-                                                 disp(['plot info message: too many ''' rawoptions.list{i,1} ''' options']);
+                                                 disp(['plot info message: too many ''' rawlist{i,1} ''' options']);
                                          end
                                  end