Changeset 339 for trunk/src/fileparts_uvmat.m

Timestamp:

Dec 19, 2011, 10:12:56 AM (13 years ago)

Author:

sommeria

Message:

name2display replaced by fileparts_uvmat and find_file_series in series.
name2display partially replaced in civ.m (to be continued)
series.fig reorganized with panels.

File:

• trunk/src/fileparts_uvmat.m (modified) (6 diffs)

trunk/src/fileparts_uvmat.m

@@ -38 +38 @@
 NomType='';
 
-
-
 %% display help and test function in the absence of input arument
 if ~exist('FileInput','var')
@@ -47 +45 @@
 end
 
+%% default root name output
 [RootPath,FileName,FileExt]=fileparts(FileInput);
-RootFile=FileName;%default
-% switch FileExt
-%     case '.avi'
-%         NomType='*';
-%         return
-%     case {'.tif','.tiff'}
-%         if exist(FileInput,'file')
-%             info=iminfo(FileInput);
-%             if length(info)>1
-%                 NomType='*';
-%                 return
-%             end
-%         end 
-% end
-
-% \D not a digit
-% \d digit
-
-
-%% recursive test on FileName starting from the end
-% case of pure number
+RootFile=FileName;
+
+%% case of input file name which is a pure number
 if ~isnan(str2double(FileName))
     RootFile='';
@@ -74 +55 @@
     return
 end
+
+%% recursive test on FileName starting from the end
 % test whether FileName ends with a number or not
 r=regexp(FileName,'.*\D(?<num1>\d+)$','names');% \D = not a digit, \d =digit
@@ -141 +124 @@
         i1=str2double(r.num1);
         NomType=[get_type(r.num1) NomType];
-        r=regexp(RootPath,'\<(?<newrootpath>.+)(\\|/)(?<subdir>[^\\^/]+)(\\|/)*\>','names');
-        if ~isempty(r)
-            SubDir=r.subdir;
-            RootPath=r.newrootpath;
-        end
     end
 end
@@ -153 +131 @@
     RootFile(end)=[];
     NomType=['_' NomType];
+end
+
+%% extract subdirectory for pairs i1-i2 or j1-j2 (or ab, AB)
+if ~isempty(i2) || ~isempty(j2)
+    r=regexp(RootPath,'\<(?<newrootpath>.+)(\\|/)(?<subdir>[^\\^/]+)(\\|/)*\>','names');
+    if ~isempty(r)
+        SubDir=r.subdir;
+        RootPath=r.newrootpath;
+    end
 end
 
@@ -162 +149 @@
 %     end
 % end
-
-