Changeset 27255

Timestamp:

08/31/22 15:45:12 (3 years ago)

Author:

Eric.Larour

Message:

CHG: better handling of data loading, more granularity.

File:

• issm/branches/trunk-larour-SLPS2022/src/m/classes/organizer.m (modified) (2 diffs)

issm/branches/trunk-larour-SLPS2022/src/m/classes/organizer.m

@@ -134 +134 @@
                         error(['Could not find ' path ]);
                 end%}}}
-                function loaddata(org,string),% {{{
+                function loaddata(org,string,varargin),% {{{
 
                         %Get model path
                         if ~ischar(string), error('argument provided is not a string'); end
                         path=[org.repository '/' org.prefix string];
+                
+                        %any extra options? 
+                        if nargin==3,
+                                datas=varargin{:};
+                        else
+                                datas=cell(0);
+                        end
+                        if ~isa(datas,'char') & ~isa(datas,'cell'),
+                                error('loaddata error message: extra parameters should either be a string or cell array of string');
+                        end
+                        if isa(datas,'char'),
+                                datas={datas};
+                        end
 
                         %figure out if the data is there, otherwise, we have to use the default path supplied by user.
@@ -149 +162 @@
                         end
                         if exist(path,'file')
-                                evalin('caller',['load -mat ' path]);
+                                if ~numel(datas),
+                                        string=sprintf('load(''%s'',''-mat'');',path);
+                                else
+                                        string=sprintf('load(''%s'',''-mat'',',path);
+                                        for i=1:numel(datas)-1,
+                                                datai=datas{i};
+                                                string=sprintf('%s''%s'',',string,datai);
+                                        end
+                                        datai=datas{end};
+                                        string=sprintf('%s''%s'');',string,datai);
+                                end
+                                evalin('caller',string);
                                 return;
                         end