Changeset 360 for trunk/src/fullfile_uvmat.m

Timestamp:

Jan 9, 2012, 1:16:35 AM (13 years ago)

Author:

sommeria

Message:

civ: bugs corrected. Iintroduction of an xm file for parameters read using the new fct fill_GUI (to test and improve)
cleaning in uvmat. Possibility of using blank increment added (go to the next available file)
fullfile_uvmat: case of two equal indices in a pair, bug repair.
find_fileseries: improved speed.

File:

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

trunk/src/fullfile_uvmat.m

@@ -36 +36 @@
 
 function filename=fullfile_uvmat(RootPath,SubDir,RootFile,FileExt,NomType,i1,i2,j1,j2)
-% sizf=size(filebase);
-% if (~ischar(filebase)||~isequal(sizf(1),1)),filebase='';end
-% if ~exist('ext','var')
-%     ext='';
-% end
-% if ~exist('nom_type','var')
-%     nom_type='';
-% end
-% if ~ischar(ext),ext='';end
-% % idetect=0;
-% if ~exist('i1','var') || isempty(i1) || isnan(i1)
-%     i1=1; %default
-% end
-% if ~exist('j1','var') ||  isempty(j1) || isnan(j1)
-%     j1=1; %default
-% end
-% if ~exist('i2','var') ||  isempty(i2) || isnan(i2)
-%     i2=i1; %default
-% end
-% if ~exist('j2','var') || isempty(j2) || isnan(j2)
-%     j2=j1; %default
-% end
-% if ~exist('subdir','var')|| isempty(subdir) 
-%     subdir='' ; %default
-% end
-
     
 %% display help and test function in the absence of input arument
@@ -75 +49 @@
 end
 if isequal(j1,j2)
-    j2=[];
+    j2=[];% suppress the secodn index if equal to the first
 end
 if ~exist('j1','var') 
@@ -84 +58 @@
 end
 if isequal(i1,i2)
-    i2=[];
+    i2=[];% suppress the secodn index if equal to the first
 end
 if ~exist('i1','var') 
@@ -108 +82 @@
 if ~isempty(r)
     i1_str=num2str(i1,['%0' num2str(length(r.num1)) 'd']);
-    NomType=regexprep(NomType,['^' r.num1],'');
+    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
@@ -121 +97 @@
     if ~isempty(regexp(NomType,'^[a|A]'));
         j1_str=num2stra(j1,NomType);
-        if ~isempty(regexp(NomType,'[b|B]$'));
+        if ~isempty(regexp(NomType,'[b|B]$'))&& ~isempty(j2);
             j2_str=num2stra(j2,NomType);
         end
@@ -130 +106 @@
             NomType=regexprep(NomType,['^' r.num3],'');
         end
+        if ~isempty(j2) 
         r=regexp(NomType,'-(?<num4>\d+)','names');
-        if ~isempty(r)&& ~isempty(j2)
+        if ~isempty(r)
             sep4='-';
             j2_str=num2str(j2,['%0' num2str(length(r.num4)) 'd']);
+        end
         end
     end