Changeset 601 for trunk/src/series


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

a few bugs corrected

File:
1 edited

Legend:

Unmodified
Added
Removed
  • 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
Note: See TracChangeset for help on using the changeset viewer.