Ignore:
Timestamp:
Jun 13, 2015, 7:20:37 PM (6 years ago)
Author:
sommeria
Message:

bugs corrected in fix in civ_series. vectors set to 0 inside mask

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/series/civ_input.m

    r908 r910  
    130130            return
    131131        end
     132        if isfield(Data,'.Civ1_ImageA')
    132133        [PathCiv1_ImageA,Civ1_ImageA,FileExtA]=fileparts(Data.Civ1_ImageA);%look for the source image A
    133134        [PathCiv1_ImageB,Civ1_ImageB,FileExtA]=fileparts(Data.Civ1_ImageB);%look for the source image B
     135        end
    134136        if isfield(Data,'Civ2_ImageA')
    135137            [PathCiv2_ImageA,Civ2_ImageA,FileExtA]=fileparts(Data.Civ2_ImageA);
     
    137139        end
    138140        if size(Param.InputTable,1)==1
     141             if isfield(Data,'.Civ1_ImageA')
    139142            series('display_file_name',hhseries,Data.Civ1_ImageA,'append');%append the image series to the input list
    140         end
    141         [RootPath,SubDir,RootFile,i1,i2,j1,j2,FileExt,NomTypeImaA]=fileparts_uvmat(Data.Civ1_ImageA);
     143                    [RootPath,SubDir,RootFile,i1,i2,j1,j2,FileExt,NomTypeImaA]=fileparts_uvmat(Data.Civ1_ImageA);
    142144        [RootPath,SubDir,RootFile,i1,i2,j1,j2,FileExt,NomTypeImaB]=fileparts_uvmat(Data.Civ1_ImageB);
     145             else
     146                 series('display_file_name',hhseries,Data.Civ2_ImageA,'append');%append the image series to the input list
     147                         [RootPath,SubDir,RootFile,i1,i2,j1,j2,FileExt,NomTypeImaA]=fileparts_uvmat(Data.Civ2_ImageA);
     148        [RootPath,SubDir,RootFile,i1,i2,j1,j2,FileExt,NomTypeImaB]=fileparts_uvmat(Data.Civ2_ImageB);
     149             end
     150        end
     151
    143152        iview_image=2;%line # for the input images
    144153    case 'civxdata'% case of  civx data,
Note: See TracChangeset for help on using the changeset viewer.