Changeset 601
Legend:
 Unmodified
 Added
 Removed

trunk/src/series.m
r600 r601 1342 1342 1343 1343 %% select the Action modes 1344 RunModeList=get(handles.RunMode,'String'); 1345 RunMode=RunModeList{get(handles.RunMode,'Value')}; 1344 RunMode='local';%default 1345 if isfield(Series.Action,'RunMode') 1346 RunMode=Series.Action.RunMode; 1347 end 1346 1348 ActionExt='.m';%default 1347 1349 if isfield(Series.Action,'ActionExt') … … 1456 1458 for iprocess=1:NbProcess 1457 1459 if isempty(Series.IndexRange.NbSlice) 1458 Series.IndexRange.first_i=first_i+(iprocess1)*BlockLength ;1460 Series.IndexRange.first_i=first_i+(iprocess1)*BlockLength*incr_i; 1459 1461 if Series.IndexRange.first_i>last_i 1460 1462 break 1461 1463 end 1462 Series.IndexRange.last_i=min(first_i+(iprocess)*BlockLength 1,last_i);1464 Series.IndexRange.last_i=min(first_i+(iprocess)*BlockLength*incr_i1,last_i); 1463 1465 else 1464 1466 Series.IndexRange.first_i= first_i+iprocess1; … … 1509 1511 for iprocess=1:NbProcess 1510 1512 if isempty(Series.IndexRange.NbSlice)% process by blocks of i index 1511 Series.IndexRange.first_i=first_i+(iprocess1)*BlockLength ;1513 Series.IndexRange.first_i=first_i+(iprocess1)*BlockLength*incr_i; 1512 1514 if Series.IndexRange.first_i>last_i 1513 1515 NbProcess=iprocess1; 1514 1516 break% leave the loop, we are at the end of the calculation 1515 1517 end 1516 Series.IndexRange.last_i=min(last_i,first_i+(iprocess)*BlockLength 1);1518 Series.IndexRange.last_i=min(last_i,first_i+(iprocess)*BlockLength*incr_i1); 1517 1519 else% process by slices of i index if NbSlice is defined, computation in a single process if NbSlice =1 1518 1520 Series.IndexRange.first_i= first_i+iprocess1; 
trunk/src/series/civ_series.m
r599 r601 168 168 % if ~isfield(Param.Civ1,'ImageA') 169 169 ImageName_A=fullfile_uvmat(RootPath,SubDir,RootFile,FileExt,NomType,i1_series_Civ1(ifield),[],j1_series_Civ1(ifield)); 170 [par_civ1.ImageA,MovieObject_A] = read_image(ImageName_A,FileType_A,MovieObject_A,FrameIndex_A_Civ1 );170 [par_civ1.ImageA,MovieObject_A] = read_image(ImageName_A,FileType_A,MovieObject_A,FrameIndex_A_Civ1(ifield)); 171 171 % elseif ischar(Param.Civ1.ImageA) 172 172 % Param.Civ1.ImageA=regexprep(Param.Civ1.ImageA,'''','\'); … … 175 175 % if ~isfield(Param.Civ1,'ImageB') 176 176 ImageName_B=fullfile_uvmat(RootPath,SubDir,RootFile,FileExt,NomType,i2_series_Civ1(ifield),[],j2_series_Civ1(ifield)); 177 [par_civ1.ImageB,MovieObject_B] = read_image(ImageName_B,FileType_B,MovieObject_B,FrameIndex_B_Civ1 );177 [par_civ1.ImageB,MovieObject_B] = read_image(ImageName_B,FileType_B,MovieObject_B,FrameIndex_B_Civ1(ifield)); 178 178 % elseif isfield(Param.Civ1,'ImageB')&& ischar(Param.Civ1.ImageB) 179 179 % Param.Civ1.ImageB=regexprep(Param.Civ1.ImageB,'''','\'); … … 328 328 ImageName_A_Civ2=fullfile_uvmat(RootPath,SubDir,RootFile,FileExt,NomType,i1_series_Civ2(ifield),[],j1_series_Civ2(ifield)); 329 329 330 if strcmp(ImageName_A_Civ2,ImageName_A) && isequal(FrameIndex_A_Civ1 ,FrameIndex_A_Civ2)330 if strcmp(ImageName_A_Civ2,ImageName_A) && isequal(FrameIndex_A_Civ1(ifield),FrameIndex_A_Civ2) 331 331 par_civ2.ImageA=par_civ1.ImageA; 332 332 else … … 334 334 end 335 335 ImageName_B_Civ2=fullfile_uvmat(RootPath,SubDir,RootFile,FileExt,NomType,i2_series_Civ2(ifield),[],j2_series_Civ2(ifield)); 336 if strcmp(ImageName_B_Civ2,ImageName_B) && isequal(FrameIndex_B_Civ1 ,FrameIndex_B_Civ2)336 if strcmp(ImageName_B_Civ2,ImageName_B) && isequal(FrameIndex_B_Civ1(ifield),FrameIndex_B_Civ2) 337 337 par_civ2.ImageB=par_civ1.ImageB; 338 338 else … … 915 915 NomTypeNc='_12'; 916 916 else 917 j1_series=j_series; 918 j2_series=j_series; 917 919 NomTypeNc='_12_1'; 918 920 end 
trunk/src/uvmat.m
r599 r601 544 544 [RootPath,SubDir,RootFile,i1_series,i2_series,j1_series,j2_series,tild,FileType,FileInfo,MovieObject]=find_file_series(fullfile(RootPath,SubDir),[RootFile FileIndices FileExt]); 545 545 % initiate the input file series and refresh the current field view: 546 update_rootinfo(handles,i1_series,i2_series,j1_series,j2_series,FileType, FileInfo,MovieObject,1);546 update_rootinfo(handles,i1_series,i2_series,j1_series,j2_series,FileType,MovieObject,1); 547 547 548 548 %
Note: See TracChangeset
for help on using the changeset viewer.