Changeset 716 for trunk/src/series/time_series.m

Timestamp:

Feb 24, 2014, 10:51:40 PM (10 years ago)

Author:

sommeria

Message:

fct improved by reducing the input file check when selected.

File:

• trunk/src/series/time_series.m (modified) (2 diffs)

trunk/src/series/time_series.m

@@ -43 +43 @@
 
 %% set the input elements needed on the GUI series when the action is selected in the menu ActionName or InputTable refreshed
-if isstruct(Param) && isequal(Param.Action.RUN,0)
+if isstruct(Param) && isequal(Param.Action.RUN,0)% function activated from the GUI series but not RUN 
     ParamOut.AllowInputSort='off';% allow alphabetic sorting of the list of input file SubDir (options 'off'/'on', 'off' by default)
     ParamOut.WholeIndexRange='off';% prescribes the file index ranges from min to max (options 'off'/'on', 'off' by default)
@@ -55 +55 @@
     ParamOut.OutputDirExt='.tseries';%set the output dir extension
     ParamOut.OutputFileMode='NbSlice';% '=NbInput': 1 output file per input file index, '=NbInput_i': 1 file per input file index i, '=NbSlice': 1 file per slice
-    filecell=get_file_series(Param);%check existence of the first input file
-    if ~exist(filecell{1,1},'file')
-        msgbox_uvmat('WARNING','the first input file does not exist')
+    % check the existence of the first file in the series
+        first_j=[];
+    if isfield(Param.IndexRange,'first_j'); first_j=Param.IndexRange.first_j; end
+    last_j=[];
+    if isfield(Param.IndexRange,'last_j'); last_j=Param.IndexRange.last_j; end
+    PairString='';
+    if isfield(Param.IndexRange,'PairString'); PairString=Param.IndexRange.PairString; end
+    [i1,i2,j1,j2] = get_file_index(Param.IndexRange.first_i,first_j,PairString);
+    FirstFileName=fullfile_uvmat(Param.InputTable{1,1},Param.InputTable{1,2},Param.InputTable{1,3},...
+        Param.InputTable{1,5},Param.InputTable{1,4},i1,i2,j1,j2);
+    if ~exist(FirstFileName,'file')
+        msgbox_uvmat('WARNING',['the first input file ' FirstFileName ' does not exist'])
     elseif isequal(size(Param.InputTable,1),1) && ~isfield(Param,'ProjObject')
         msgbox_uvmat('WARNING','a projection object  needs to be introduced for time_series')