Changeset 788
 Timestamp:
 Jun 28, 2014, 12:26:22 PM (9 years ago)
 Location:
 trunk/src
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

trunk/src/find_file_series.m
r784 r788 194 194 end 195 195 % update the detected index series 196 ref_i_list(ifile)=ref_i; 197 ref_j_list(ifile)=ref_j; 198 nb_pairs=0; 199 if ~isempty(i2_input) ~isempty(j2_input) %deals with pairs 200 if size(i1_series,1)>=ref_i+1 && size(i1_series,2)>=ref_j+1 201 nb_pairs=numel(find(i1_series(ref_i+1,ref_j+1,:)~=0)); 202 end 203 end 204 if i1==0 205 i1=1;% set index 0 to 1 to distinguish from the absent index (set to 0) 206 end 207 if j1==0 208 j1=1;% set index 0 to 1 to distinguish from the absent index (set to 0) 209 end 210 i1_series(ref_i+1,ref_j+1,nb_pairs+1)=i1; 211 if ~isempty(i2_input) 212 i2_series(ref_i+1,ref_j+1,nb_pairs+1)=i2; 213 end 214 if ~isempty(j1_input) 215 j1_series(ref_i+1,ref_j+1,nb_pairs+1)=j1; 216 end 217 if ~isempty(j2_input) 218 j1_series(ref_i+1,ref_j+1,nb_pairs+1)=j1; 219 j2_series(ref_i+1,ref_j+1,nb_pairs+1)=j2; 196 if ~isempty(ref_i)&&~isempty(ref_j) 197 ref_i_list(ifile)=ref_i; 198 ref_j_list(ifile)=ref_j; 199 nb_pairs=0; 200 if ~isempty(i2_input) ~isempty(j2_input) %deals with pairs 201 if size(i1_series,1)>=ref_i+1 && size(i1_series,2)>=ref_j+1 202 nb_pairs=numel(find(i1_series(ref_i+1,ref_j+1,:)~=0)); 203 end 204 end 205 if i1==0 206 i1=1;% set index 0 to 1 to distinguish from the absent index (set to 0) 207 end 208 if j1==0 209 j1=1;% set index 0 to 1 to distinguish from the absent index (set to 0) 210 end 211 i1_series(ref_i+1,ref_j+1,nb_pairs+1)=i1; 212 if ~isempty(i2_input) 213 i2_series(ref_i+1,ref_j+1,nb_pairs+1)=i2; 214 end 215 if ~isempty(j1_input) 216 j1_series(ref_i+1,ref_j+1,nb_pairs+1)=j1; 217 end 218 if ~isempty(j2_input) 219 j1_series(ref_i+1,ref_j+1,nb_pairs+1)=j1; 220 j2_series(ref_i+1,ref_j+1,nb_pairs+1)=j2; 221 end 220 222 end 221 223 end … … 229 231 end 230 232 ind_select=find(ref_ij>0); 233 231 234 if isempty(ind_select) 232 RootFile='';233 NomType='';235 % RootFile=''; 236 % NomType=''; 234 237 else 235 238 [tild,ifile_min]=min(ref_ij(ind_select)); … … 265 268 NomType='*'; 266 269 else % if there is a file index, j denotes the frame index while i denotes the file index 267 if strcmp(NomType(end1:end),'ab')% recognized as a pair270 if ~isempty(regexp(NomType,'ab$', 'once'))% recognized as a pair 268 271 RootFile=fullfile_uvmat('','',RootFile,'',NomType,i1_input,i2_input,j1_input,j2_input);% restitute the root name without the detected indices 269 272 i1_series=zeros(FileInfo.NumberOfFrames+1,2);% first column =0 
trunk/src/series/extract_rdvision.m
r786 r788 220 220 end 221 221 filename=fullfile_uvmat(RootPath{1},SubDir{1},RootFile{1},FileExt{1},'*',1); 222 OutputDir=[SubDir{1} Param Out.OutputDirExt];222 OutputDir=[SubDir{1} Param.OutputDirExt]; 223 223 for ifile=1:nbfield 224 224 update_waitbar(WaitbarHandle,ifile/nbfield)
Note: See TracChangeset
for help on using the changeset viewer.