Changeset 395 for trunk/src/find_file_series.m

Timestamp:

Apr 24, 2012, 8:46:32 PM (12 years ago)

Author:

sommeria

Message:

taking into account the xml file for PIV pairs. Comments on read_GUI

File:

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

trunk/src/find_file_series.m

@@ -44 +44 @@
 %% get input root name and nomenclature type
 [tild,tild,RootFile,tild,i2_input,j1_input,j2_input,FileExt,NomType]=fileparts_uvmat(fileinput);
-fullfileinput=fullfile(RootPath,fileinput);
+fullfileinput=fullfile(RootPath,fileinput);% input file name with path
 
 %% check for particular file types: images, movies, civ data
@@ -60 +60 @@
 if strcmp(NomType,'')||strcmp(NomType,'*')||strcmp(option,'filetype')
     if exist(fullfileinput,'file')
-        [tild,RootFile]=fileparts(fileinput);% case of constant name (no indexing)
+        RootFile=fileinput;% case of constant name (no indexing)
+       % [tild,RootFile]=fileparts(fileinput);% case of constant name (no indexing)
     else
         RootFile='';
     end
 else
-    %% possibly include the first index in the root name, if there exists a   corresponding xml file
+    %% possibly include the first index in the root name, if there exists a corresponding xml file
     %   RootFileNew=RootFile;
     %     if ~isempty(regexp(NomType,['^_']))
@@ -76 +77 @@
     if ~isempty(r)
         fileinput_end=regexprep(fileinput,['^' RootFile],'');%remove RootFile at the beginning of fileinput
-        if isempty(regexp(r.tiretnum,'^_'))% if a separator '_' is not  detected
+        if isempty(regexp(r.tiretnum,'^_','once'))% if a separator '_' is not  detected
             rr=regexp(fileinput_end,'^(?<i1>\d+)','names');
         else% if a separator '_' is  detected
@@ -83 +84 @@
         if ~isempty(rr)
             RootFileNew=[RootFile rr.i1];
-            if exist(fullfile(RootPath,[RootFileNew '.xml']),'file')
+            checkpair=~isempty(regexp(NomType,'-','once'))||~isempty(regexp(NomType,'ab$','once'))||~isempty(regexp(NomType,'AB$','once'));%case of PIV results
+            if exist(fullfile(RootPath,[RootFileNew '.xml']),'file') || (checkpair && exist(fullfile(fileparts(RootPath),[RootFileNew '.xml']),'file'))
                 RootFile=RootFileNew;
                 NomTypePref=r.tiretnum;
@@ -90 +92 @@
                 j1_input=[];
                 j2_input=[];
-            end
+            end       
         end
     end