Changeset 332 for trunk/src/name2display.m

Timestamp:

Dec 13, 2011, 11:20:07 AM (12 years ago)

Author:

sommeria

Message:

NomType? changed from _i1-i2 ... to _1-2 ... (bugs to be expected!)
bug corrected in geometry_calib
series changed by introducing a from FileIndices?, introduction of find_file_series to detect the file series corresponding to an input file

File:

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

trunk/src/name2display.m

@@ -18 +18 @@
 %   nom_type='_1a','_1A','_01a','_01A',...: idem, with a separator '_' before the index
 %   nom_type='_1_1','_01_1',...: matrix of files with two indices i and j separated by '_'(e.g. 'aa_45_2.png')
-%   nom_type='_i1-i2': from pairs from a single index (e.g. 'aa_45-47.nc')
-%   nom_type='_i_j1-j2': pairs of j indices (e.g. 'aa_45_2-3.nc')
-%   nom_type='_i1-i2_j': pairs of i indices (e.g. 'aa_45-46_2.nc')
+%   nom_type='_1-2': from pairs from a single index (e.g. 'aa_45-47.nc')
+%   nom_type='_1_1-2': pairs of j indices (e.g. 'aa_45_2-3.nc')
+%   nom_type='_1-2_j': pairs of i indices (e.g. 'aa_45-46_2.nc')
 %   nom_type='_1_ab','1_ab','01_ab'..., from pairs of '#' images (e.g.'aa045bc.nc'), ext='.nc'
 %subdir: name of the subdirectory for netcdf files
@@ -69 +69 @@
 penult=double(RootFile(indcur-1));%ascii code of the penultimate character
 testsub=0; %default 
-% case of an indexed series in a single file
-if strcmpi(ext,'.avi')
-     nom_type='*';
-%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))
+% % case of an indexed series in a single file
+% if strcmpi(ext,'.avi')
+%      nom_type='*';
+% %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)  
+if  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
@@ -98 +98 @@
     str_a=num2;
     str_b=num3;
-    nom_type='_i1-i2_j1-j2';
+    nom_type='_1-2_1-2';
     testsub=1;
     indcur=separ0-1;
@@ -105 +105 @@
     str2=num2;
     str_a=num3;
-    nom_type='_i1-i2_j';
+    nom_type='_1-2_1';
     testsub=1;
     indcur=separ1-1;
@@ -113 +113 @@
     str_a=num2;
     str_b=num3;
-    nom_type='_i_j1-j2';
+    nom_type='_1_1-2';
     testsub=1;
 elseif strcmp(filelit(end-1:end),'_-')
@@ -120 +120 @@
     str2=num3;
     str_a='';
-    nom_type='_i1-i2';
+    nom_type='_1-2';
     testsub=1;
 elseif strcmp(filelit(end-1:end),'__')