Changeset 961 for trunk/src/fullfile_uvmat.m

Timestamp:

Jun 28, 2016, 9:05:33 AM (8 years ago)

Author:

sommeria

Message:

NomType? level introduced

File:

• trunk/src/fullfile_uvmat.m (modified) (2 diffs)

trunk/src/fullfile_uvmat.m

@@ -76 +76 @@
 end
 if isequal(i1,i2)
-    i2=[];% suppress the secodn index if equal to the first
+    i2=[];% suppress the second index if equal to the first
 end
 if ~exist('i1','var') 
@@ -93 +93 @@
 
 %% look for NomType with pairs (separator '-' or terminasion ab or AB
-if ~isempty(regexp(NomType,'^_\d'))
-    sep1='_';
-    NomType(1)=[];%remove '_' from the beginning of NomType
-end
-r=regexp(NomType,'^(?<num1>\d+)','names');%look for a number at the beginning of NomType
-if ~isempty(r)
-    i1_str=num2str(i1,['%0' num2str(length(r.num1)) 'd']);
-    NomType=regexprep(NomType,['^' r.num1],'');   
-    r=regexp(NomType,'^-(?<num2>\d+)','names');%look for a pair i1-i2
-    if ~isempty(r)
-         if ~isempty(i2)
-        sep2='-';
-         i2_str=num2str(i2,['%0' num2str(length(r.num2)) 'd']);
-         end
-         NomType=regexprep(NomType,['^-' r.num2],'');
-    end
-    if ~isempty(regexp(NomType,'^_'));
-        sep3='_';
+if strcmp(NomType,'level')% organisation with a sub-folder for the files of each index i
+    filename=fullfile(RootPath,SubDir,['level' num2str(j1)],[RootFile num2str(i1) FileExt]);
+else
+    if ~isempty(regexp(NomType,'^_\d'))
+        sep1='_';
         NomType(1)=[];%remove '_' from the beginning of NomType
     end
-    if ~isempty(regexp(NomType,'^[a|A]'));
-        j1_str=num2stra(j1,NomType);
-        if ~isempty(regexp(NomType,'[b|B]$'))&& ~isempty(j2);
-            j2_str=num2stra(j2,NomType);
+    r=regexp(NomType,'^(?<num1>\d+)','names');%look for a number at the beginning of NomType
+    if ~isempty(r)
+        i1_str=num2str(i1,['%0' num2str(length(r.num1)) 'd']);
+        NomType=regexprep(NomType,['^' r.num1],'');
+        r=regexp(NomType,'^-(?<num2>\d+)','names');%look for a pair i1-i2
+        if ~isempty(r)
+            if ~isempty(i2)
+                sep2='-';
+                i2_str=num2str(i2,['%0' num2str(length(r.num2)) 'd']);
+            end
+            NomType=regexprep(NomType,['^-' r.num2],'');
         end
-    else
-        r=regexp(NomType,'^(?<num3>\d+)','names');
-        if ~isempty(r)
-            j1_str=num2str(j1,['%0' num2str(length(r.num3)) 'd']);
-            NomType=regexprep(NomType,['^' r.num3],'');
+        if ~isempty(regexp(NomType,'^_'));
+            sep3='_';
+            NomType(1)=[];%remove '_' from the beginning of NomType
         end
-        if ~isempty(j2) 
-        r=regexp(NomType,'-(?<num4>\d+)','names');
-        if ~isempty(r)
-            sep4='-';
-            j2_str=num2str(j2,['%0' num2str(length(r.num4)) 'd']);
-        end
+        if ~isempty(regexp(NomType,'^[a|A]'));
+            j1_str=num2stra(j1,NomType);
+            if ~isempty(regexp(NomType,'[b|B]$'))&& ~isempty(j2);
+                j2_str=num2stra(j2,NomType);
+            end
+        else
+            r=regexp(NomType,'^(?<num3>\d+)','names');
+            if ~isempty(r)
+                j1_str=num2str(j1,['%0' num2str(length(r.num3)) 'd']);
+                NomType=regexprep(NomType,['^' r.num3],'');
+            end
+            if ~isempty(j2)
+                r=regexp(NomType,'-(?<num4>\d+)','names');
+                if ~isempty(r)
+                    sep4='-';
+                    j2_str=num2str(j2,['%0' num2str(length(r.num4)) 'd']);
+                end
+            end
         end
     end
+    filename=fullfile(RootPath,SubDir,RootFile);
+    filename=[filename sep1 i1_str sep2 i2_str sep3 j1_str sep4 j2_str];
+    filename=[regexprep(filename,'_$','') FileExt];%suppress possible '_' at the end of the string and add the extension
 end
-filename=fullfile(RootPath,SubDir,RootFile);
-filename=[filename sep1 i1_str sep2 i2_str sep3 j1_str sep4 j2_str];
-filename=[regexprep(filename,'_$','') FileExt];%suppress possible '_' at the end of the string and add the extension
-
 
 function test