Changeset 601


Ignore:
Timestamp:
Apr 3, 2013, 1:39:53 PM (8 years ago)
Author:
sommeria
Message:

a few bugs corrected

Location:
trunk/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/series.m

    r600 r601  
    13421342
    13431343%% select the Action modes
    1344 RunModeList=get(handles.RunMode,'String');
    1345 RunMode=RunModeList{get(handles.RunMode,'Value')};
     1344RunMode='local';%default
     1345if isfield(Series.Action,'RunMode')
     1346RunMode=Series.Action.RunMode;
     1347end
    13461348ActionExt='.m';%default
    13471349if isfield(Series.Action,'ActionExt')
     
    14561458    for iprocess=1:NbProcess
    14571459        if isempty(Series.IndexRange.NbSlice)
    1458             Series.IndexRange.first_i=first_i+(iprocess-1)*BlockLength;
     1460            Series.IndexRange.first_i=first_i+(iprocess-1)*BlockLength*incr_i;
    14591461            if Series.IndexRange.first_i>last_i
    14601462                break
    14611463            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_i-1,last_i);
    14631465        else
    14641466            Series.IndexRange.first_i= first_i+iprocess-1;
     
    15091511    for iprocess=1:NbProcess
    15101512        if isempty(Series.IndexRange.NbSlice)% process by blocks of i index
    1511             Series.IndexRange.first_i=first_i+(iprocess-1)*BlockLength;
     1513            Series.IndexRange.first_i=first_i+(iprocess-1)*BlockLength*incr_i;
    15121514            if Series.IndexRange.first_i>last_i
    15131515                NbProcess=iprocess-1;
    15141516                break% leave the loop, we are at the end of the calculation
    15151517            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_i-1);
    15171519        else% process by slices of i index if NbSlice is defined, computation in a single process if NbSlice =1
    15181520            Series.IndexRange.first_i= first_i+iprocess-1;
  • trunk/src/series/civ_series.m

    r599 r601  
    168168            %         if ~isfield(Param.Civ1,'ImageA')
    169169            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));
    171171            %         elseif ischar(Param.Civ1.ImageA)
    172172            %             Param.Civ1.ImageA=regexprep(Param.Civ1.ImageA,'''','\');
     
    175175            %         if ~isfield(Param.Civ1,'ImageB')
    176176            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));
    178178            %         elseif isfield(Param.Civ1,'ImageB')&& ischar(Param.Civ1.ImageB)
    179179            %              Param.Civ1.ImageB=regexprep(Param.Civ1.ImageB,'''','\');
     
    328328        ImageName_A_Civ2=fullfile_uvmat(RootPath,SubDir,RootFile,FileExt,NomType,i1_series_Civ2(ifield),[],j1_series_Civ2(ifield));
    329329
    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)
    331331            par_civ2.ImageA=par_civ1.ImageA;
    332332        else
     
    334334        end
    335335        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)
    337337            par_civ2.ImageB=par_civ1.ImageB;
    338338        else
     
    915915        NomTypeNc='_1-2';
    916916    else
     917        j1_series=j_series;
     918        j2_series=j_series;
    917919        NomTypeNc='_1-2_1';
    918920    end
  • trunk/src/uvmat.m

    r599 r601  
    544544[RootPath,SubDir,RootFile,i1_series,i2_series,j1_series,j2_series,tild,FileType,FileInfo,MovieObject]=find_file_series(fullfile(RootPath,SubDir),[RootFile FileIndices FileExt]);
    545545% 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);
     546update_rootinfo(handles,i1_series,i2_series,j1_series,j2_series,FileType,MovieObject,1);
    547547
    548548%-----------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.