Changeset 15396 for issm/trunk/src/m/classes/plotoptions.m

Timestamp:

07/02/13 09:24:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 15394

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/m/classes/plotoptions.m (modified) (3 diffs)

issm/trunk

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

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

@@ -45 +45 @@
                          %check length of input
                          if mod((nargin-1),2),
-                                 error('buildlist error message: an even number of plotoptions is required')
+                                 error('Invalid parameter/value pair arguments')
                          end
 
@@ -52 +52 @@
                          numoptions = (nargin-1)/2;
                          rawlist=cell(numoptions,2);
+                         counter=1;
                          for i=1:numoptions,
-                                 if ischar(varargin{2*i-1}),
-                                         rawlist{i,1}=varargin{2*i-1};
-                                         rawlist{i,2}=varargin{2*i};
+                                 optionname = varargin{2*i-1};
+                                 optionval  = varargin{2*i};
+                                 if ischar(optionname),
+                                         rawlist{counter,1}=optionname;
+                                         rawlist{counter,2}=optionval;
+                                         counter=counter+1;
                                  else
                                          %option is not a string, ignore it
                                          disp(['WARNING: option number ' num2str(i) ' is not a string, it will be ignored']);
-                                         rawlist(i,:)=[];
+                                         rawlist(counter,:)=[];
                                          continue
                                  end
                          end
-
-                         %get figure number
-                         opt.figurenumber=getfieldvalue(rawoptions,'figure',1);
 
                          %get number of data to be plotted
@@ -162 +163 @@
                                  opt.list{i}=deleteduplicates(opt.list{i},1);
                          end
+
+                         %Get figure number (should be in options for subplot 1)
+                         opt.figurenumber=getfieldvalue(opt.list{1},'figure',1);
+                         removefield(opt.list{1},'figure',0);
+
                  end
                  %}}}

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache