Changeset 2439 for issm/trunk/src/m/classes/@plotoptions

Timestamp:

10/20/09 09:00:51 (16 years ago)

Author:

Mathieu Morlighem

Message:

Now use pairoptions in plots

Location:

issm/trunk/src/m/classes/@plotoptions

Files:

• buildlist.m (modified) (4 diffs)
• display.m (modified) (1 diff)
• plotoptions.m (modified) (1 diff)
• subsref.m (added)

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

@@ -13 +13 @@
 rawoptions=pairoptions(varargin{:});
 
+%get figure number
+plotoptions.figurenumber=getfieldvalue(rawoptions,'figure',1);
+
 %get number of data to be plotted
 numberofplots=fieldoccurences(rawoptions,'data');
@@ -26 +29 @@
 for i=1:size(rawoptions.list,1),
 
-        %option ends by #all
-        if  strncmpi(fliplr(rawoptions.list{i,1}),fliplr('#all'),4),
-
-                %Assign to all subplots
-                for j=1:numberofplots,
-                        plotoptions.list{j}=addfield(plotoptions.list{j},rawoptions.list{i,1},rawoptions.list{i,2});
-                end
-
-        %option ends by #i
-        elseif ismember('#',rawoptions.list{i,1}),
+        %option contains '#'
+        if ismember('#',rawoptions.list{i,1}),
 
                 %get suplot(s) associated
@@ -42 +37 @@
                 field=string{1};
 
-                %assign to subplot
-                plotoptions.list{str2num(plotnum)}=addfield(plotoptions.list{str2num(plotnum)},field,rawoptions.list{i,2});
+                %#all
+                if strcmpi(plotnum,'all');
+                        for j=1:numberofplots,
+                                plotoptions.list{j}=addfield(plotoptions.list{j},field,rawoptions.list{i,2});
+                        end
+                %#i
+                else
+                        %assign to subplot
+                        plotoptions.list{str2num(plotnum)}=addfield(plotoptions.list{str2num(plotnum)},field,rawoptions.list{i,2});
+                end
 
         %assign option field to corresponding subplot
@@ -63 +66 @@
         end
 end
+
+%check that there is no duplicates
+for i=1:numberofplots,
+        plotoptions.list{i}=deleteduplicates(plotoptions.list{i},1);
+end

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

@@ -6 +6 @@
 disp(sprintf('\n%s = \n',inputname(1)));
 disp(sprintf('   numberofplots: %i',plotoptions.numberofplots));
+disp(sprintf('   figurenumber: %i',plotoptions.figurenumber));
 if ~isempty(plotoptions.list),
         disp(sprintf('   list: (%ix%i)',size(plotoptions.list,1),size(plotoptions.list,2)));

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

@@ -13 +13 @@
 
 options.numberofplots=0;
+options.figurenumber=1;
 options.list=cell(0,0);
 options=class(options,'plotoptions');