Changeset 138 for trunk/src

Timestamp:

Nov 26, 2010, 5:44:41 AM (14 years ago)

Author:

sommeria

Message:

bug repair for name generation in case of constant name (no indexing)

Location:

trunk/src

Files:

• name2display.m (modified) (4 diffs)
• name_generator.m (modified) (1 diff)

trunk/src/name2display.m

@@ -74 +74 @@
 %case of a numerical index follewed by a lower case letter (e.g. a,b,c):
 %the penultimate character is a number and the last one a letter (lower case: last >= 97 && last <= 122
-%                                                                 capital letter:  last >= 65 && last <= 90)                                                             
-elseif  penult >= 48 && penult <= 57 && (last >= 65 && last <= 90)||(last >= 97 && last <= 122)
+%                                                                 capital
+%                                                                 letter:  last >= 65 && last <= 90)  
+elseif  penult >= 48 && penult <= 57 && ((last >= 65 && last <= 90)||(last >= 97 && last <= 122))
     str_a=last_str; %extract appendix a,b,c... or A,B,C... as output.
     ind_end=indcur-1; %current index just before the suffix letter
@@ -129 +130 @@
 elseif strcmp(filelit(end),'_')
     indcur=separ3-1;
-%     field_count=num3;
     str2='';
     str_a='';
     %detect zeros before the number
-%     count=0; % extract the numerical appendix
     field_count=RootFile(separ3+1:end);% set the selected field number'%03d'
     charstring=['%0' num2str(length(field_count)) 'd'];
     nom_type=['_' num2str(1,charstring)];
-%     if strcmp('0',RootFile(separ3+1)); % select the non-numerical characters
-%         nom_type=['_%0' num2str(length(RootFile(separ3+1:end))) 'd'];
-%     else
-%         nom_type='_i';
-%     end  
-     
 elseif RootFile(indcur-2)=='_'% search appendix a,b,c,d
-    last=RootFile(indcur-1:indcur);
-    if isequal(length(last),2) 
-          str_a=last(1);%put appendix a,b,c, ou d
-          str_b=last(2);%put appendix a,b,c, ou d
-%           indcur=indcur-3;
-          separ0=indsel(end-3);
+    lasts=RootFile(indcur-1:indcur);
+%     if isequal(length(last),2) 
+        str_a=lasts(1);%put appendix a,b,c, ou d
+        str_b=lasts(2);%put appendix a,b,c, ou d
+        separ0=indsel(end-3);
         field_count=RootFile(separ0+1:separ1-1);
         indcur=separ0;
-        if double(last) >= 97 & double(last)<= 122 
+        if double(lasts) >= 97 & double(lasts)<= 122 
             nom_type='_ab';
             testsub=1;
-        elseif double(last) >= 65 & double(last) <= 90 
+        elseif double(lasts) >= 65 & double(lasts) <= 90 
             nom_type='_AB';
             testsub=1;
@@ -161 +153 @@
         charstring=['%0' num2str(length(field_count)) 'd'];
         nom_type=[num2str(1,charstring) nom_type];
-    end
+%     end
 %search for other names with counter
 else
@@ -178 +170 @@
                 charstring=['%0' num2str(length(field_count)) 'd'];
                 nom_type=num2str(1,charstring);
-%                 if isequal(field_count(1),'0')
-%                     nbfigures=length(field_count);
-%                     nom_type=['%0' num2str(nbfigures) 'd'];
-%                 else
-%                     nom_type='#';
-%                 end
             end
     end

trunk/src/name_generator.m

@@ -85 +85 @@
     nom_type_mod=nom_type;
     num_j_str='';
-    if strcmp(nom_type(1),'_')
-        filename=[filename '_'];
-        nom_type_mod(1)=[];
-    end
-    if strcmp(nom_type_mod(end),'a')
-        nom_type_mod(end)=[];
-        num_j_str=char(num_j1+96);% lower letter corresponding to the index
-    elseif strcmp(nom_type_mod(end),'A')
-        nom_type(end)=[];
-        num_j_str=char(num_j1+64);% lower letter corresponding to the index
-    elseif isequal(numel(regexp(nom_type_mod,'_')),1)%if a second separator '_' exists in nom_type
-        num_j_str=['_' num2str(num_j1)];
-        nom_type_mod(regexp(nom_type_mod,'_'):end)=[];
+    if strcmp(nom_type,'1')
+        filename=[filename num2str(num_i1) ext];
+    elseif length(nom_type)<=1%fixed name , no indexing, for instance '*'
+        filename=[filename ext];
     else
-        num_j1_out=[];%no index j
-    end
-    if ~isnan(str2double(nom_type_mod))    
-        numtype=['%0' num2str(length(nom_type_mod)) 'd'];%indicate the number of digits (0 before the number)
-        filename=[filename num2str(num_i1,numtype) num_j_str ext];
-        num_i2_out=num_i1_out;
-        num_j2_out=num_j1_out;
-    else %fixed name , no indexing, for instance '*'
-%           filebasesub=filebase;
-        filename=[filename ext];
+        nom_type_mod=nom_type;
+        if strcmp(nom_type(1),'_')
+            filename=[filename '_'];
+            nom_type_mod(1)=[];
+        end
+        if strcmp(nom_type_mod(end),'a')
+            nom_type_mod(end)=[];
+            num_j_str=char(num_j1+96);% lower letter corresponding to the index
+        elseif strcmp(nom_type_mod(end),'A')
+            nom_type(end)=[];
+            num_j_str=char(num_j1+64);% lower letter corresponding to the index
+        elseif isequal(numel(regexp(nom_type_mod,'_')),1)%if a second separator '_' exists in nom_type
+            num_j_str=['_' num2str(num_j1)];
+            nom_type_mod(regexp(nom_type_mod,'_'):end)=[];
+        else
+            num_j1_out=[];%no index j
+        end
+        if ~isnan(str2double(nom_type_mod))    
+            numtype=['%0' num2str(length(nom_type_mod)) 'd'];%indicate the number of digits (0 before the number)
+            filename=[filename num2str(num_i1,numtype) num_j_str ext];
+            num_i2_out=num_i1_out;
+            num_j2_out=num_j1_out;
+        else %fixed name 
+            filename=[filename ext];
+        end
     end