Changeset 371 for trunk/src/find_file_series.m

Timestamp:

Jan 14, 2012, 1:44:13 PM (12 years ago)

Author:

sommeria

Message:

various bug fixes with file indexing. mode displacement from a fixed image introduced.
PIV stereo suppressed (todo: introduce in the GUI series).
find_file_series cleaned, with a change in the function arguments

File:

• trunk/src/find_file_series.m (modified) (9 diffs)

trunk/src/find_file_series.m

@@ -4 +4 @@
 %
 % OUTPUT:
-% RootPath,RootFile: root path and root name detected in fileinput, possibly modified for movies (indexing is then done on image view, not file)
+% RootFile: root file detected in fileinput, possibly modified for movies (indexing is then done on image view, not file)
 % i1_series(ref_i+1, ref_j+1,pair),i2_series,j1_series,j2_series: set of indices (i1,i2,j1,j2) sorted by ref index ref_i, ref_j, and pairindex in case of multiple pairs with the same ref
 %  (ref_i+1 is used to deal with the image index zero sometimes used)
@@ -18 +18 @@
 %
 %INPUT
-% fileinput: name (including path)  of the input file
+% RootPath: path to the directory to be scanned
+% fileinput: name (without path) of the input file sample 
 %
 %AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
@@ -36 +37 @@
 %AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 
-function [RootPath,RootFile,i1_series,i2_series,j1_series,j2_series,NomType,FileType,Object]=find_file_series(fileinput)
+function [RootFile,i1_series,i2_series,j1_series,j2_series,NomType,FileType,Object]=find_file_series(RootPath,fileinput)
 %------------------------------------------------------------------------
 
 %% get input root name and nomenclature type
-[RootPath,SubDir,RootFile,tild,i2_input,j1_input,j2_input,FileExt,NomType]=fileparts_uvmat(fileinput);
+[tild,tild,RootFile,tild,i2_input,j1_input,j2_input,FileExt,NomType]=fileparts_uvmat(fileinput);
+fullfileinput=fullfile(RootPath,fileinput);
 
 %% check for particular file types: images, movies, civ data
@@ -49 +51 @@
 j1_series=zeros(1,1,1);
 j2_series=zeros(1,1,1);
+
 switch FileExt
     % ancillary files, no field indexing
@@ -64 +67 @@
         NomType='';
     otherwise
+      
         if ~isempty(FileExt)&& ~isempty(imformats(FileExt(2:end)))
             try
-                imainfo=imfinfo(fileinput);
+                imainfo=imfinfo(fullfileinput);
                 FileType='image';
                 if length(imainfo) >1 %case of image with multiple frames
@@ -72 +76 @@
                     FileType='multimage';
                     i1_series=(1:length(imainfo))';
-                    [RootPath,RootFile]=fileparts(fileinput);
+                    [RootPath,RootFile]=fileparts(fullfileinput);
                 end
             end
         else
             try
-                Data=nc2struct(fileinput,'ListGlobalAttribute','absolut_time_T0','Conventions');
+                Data=nc2struct(fullfileinput,'ListGlobalAttribute','absolut_time_T0','Conventions');
                 if ~isempty(Data.absolut_time_T0')
                     FileType='civx'; % test for civx velocity fields
@@ -88 +92 @@
             try
                 if exist('VideoReader','file')%recent version of Matlab
-                    Object=VideoReader(fileinput);
+                    Object=VideoReader(fullfileinput);
                 else
-                    Object=mmreader(fileinput);%older Matlab function for movies
+                    Object=mmreader(fullfileinput);%older Matlab function for movies
                 end
                 NomType='*';
@@ -100 +104 @@
 
 if strcmp(NomType,'')||strcmp(NomType,'*')
-    if exist(fileinput,'file')
-        [RootPath,RootFile]=fileparts(fileinput);% case of constant name (no indexing)
-    else
-        RootPath='';
+    if exist(fullfileinput,'file')
+        [tild,RootFile]=fileparts(fileinput);% case of constant name (no indexing)
+    else     
         RootFile='';
     end
@@ -163 +166 @@
         end
     end
-    detect_string=[sep1 i1_str sep2 i2_str sep3 j1_str sep4 j2_str];%string used in regexp to detect file indices
+    detect_string=['^' RootFile sep1 i1_str sep2 i2_str sep3 j1_str sep4 j2_str FileExt '$'];%string used in regexp to detect file indices
     %find the string used to extract the relevant files with the command dir
-    star_string=['*' sep1 i1_star sep2 i2_star sep3 j1_star sep4 j2_star '*'];
+    star_string=[RootFile sep1 i1_star sep2 i2_star sep3 j1_star sep4 j2_star '*'];
     wd=pwd;%current working directory
-    RR=fullfile(RootPath,SubDir);
-    cd (RR)% move to the local dir to save time in the operation dir.
-    dirpair=dir([RootFile star_string FileExt]);% look for relevant files in the file directory
+    %RR=fullfile(RootPath,SubDir);
+    cd (RootPath)% move to the local dir to save time in the operation dir.
+    dirpair=dir([star_string FileExt]);% look for relevant files in the file directory
     cd(wd)
     nbpair=numel(dirpair);