Changeset 343 for trunk/src/find_file_series.m

Timestamp:

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

Author:

sommeria

Message:

-bugs repaired in civ
-change in find_file_series to account for possible file index 0
-name2display suppressed in all functions, replaced by fileparts_uvmat (except incorporated in civ_3D)
-open_uvmat introduced to open files from a list

File:

• trunk/src/find_file_series.m (modified) (3 diffs)

trunk/src/find_file_series.m

@@ -5 +5 @@
 % OUTPUT:
 % RootPath,RootFile: root path and root name detected in fileinput, possibly modified for movies (indexing is then done on image view, not file)
-% i1_series(ref_i, ref_j,pair),i2_series,j1_series,j2_series: set of indices (i1,i2,j1,j2) sorted by ref index ref_i, ref_j, and pairindex in case of multiple pairs with the same ref
+% i1_series(ref_i+1, ref_j+1,pair),i2_series,j1_series,j2_series: set of indices (i1,i2,j1,j2) sorted by ref index ref_i, ref_j, and pairindex in case of multiple pairs with the same ref
+%  (ref_i+1 is used to deal with the image index zero sometimes used)
 % NomType: nomenclature type corrected after checking the first file (problem of 0 before the number string)
 % FileType: type of file, =
@@ -129 +130 @@
     for ifile=1:nbpair
         [~,~,~,i1,i2,j1,j2]=fileparts_uvmat(dirpair(ifile).name);
-        %             i1_series(ifile)=i1;
         ref_i=i1;
         if isempty(i2_input)
@@ -162 +162 @@
         nb_pairs=0;
         if ~isempty(i2_input)|| ~isempty(j2_input) %deals with  pairs
-            if size(i1_series,1)>=ref_i && size(i1_series,2)>=ref_j
-                nb_pairs=numel(find(i1_series(ref_i,ref_j,:)~=0));
-            end
-        end
-        i1_series(ref_i,ref_j,nb_pairs+1)=i1;
+            if size(i1_series,1)>=ref_i+1 && size(i1_series,2)>=ref_j+1
+                nb_pairs=numel(find(i1_series(ref_i+1,ref_j+1,:)~=0));
+            end
+        end
+        i1_series(ref_i+1,ref_j+1,nb_pairs+1)=i1;
         if ~isempty(i2_input)
-            i2_series(ref_i,ref_j,nb_pairs+1)=i2;
+            i2_series(ref_i+1,ref_j+1,nb_pairs+1)=i2;
         end
         if ~isempty(j1_input)
-            j1_series(ref_i,ref_j,nb_pairs+1)=j1;
+            j1_series(ref_i+1,ref_j+1,nb_pairs+1)=j1;
         end
         if ~isempty(j2_input)
-            j1_series(ref_i,ref_j,nb_pairs+1)=j1;
-            j2_series(ref_i,ref_j,nb_pairs+1)=j2;
+            j1_series(ref_i+1,ref_j+1,nb_pairs+1)=j1;
+            j2_series(ref_i+1,ref_j+1,nb_pairs+1)=j2;
         end
     end