Changeset 981 for trunk


Ignore:
Timestamp:
Jan 14, 2017, 8:46:35 PM (4 years ago)
Author:
sommeria
Message:

read cine updated

Location:
trunk/src/series
Files:
2 edited

Legend:

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

    r977 r981  
    232232    % get the surface shape corresponding to the PIV measurements
    233233    for indextemp=field_index:field_index+1;%TODO: generalise to field index intervals>1 for PIV
    234         idtemp=idtemp+1;
    235         InputFile_3=fullfile(Param.InputTable{3,1},Param.InputTable{3,2},[Param.InputTable{3,3} '_' int2str(first_img+indextemp-1) '.nc']);
     234        idtemp=idtemp+1;       
    236235        if NbView==3 % if there is only 1 stereo folder (2 cameras only), extract directly Xphys,Yphys and Zphys 
     236            InputFile_3=fullfile(Param.InputTable{3,1},Param.InputTable{3,2},[Param.InputTable{3,3} '_' int2str(first_img+indextemp-1) '.nc']);
    237237            % Data{1}: =raw PIV camera 1 only
    238238            % Data{2}: =raw PIV camera 2 only
     
    321321           
    322322        end
    323        
     323        if NbView>2
    324324        ZItemp(:,:,idtemp)=griddata(Xphys,Yphys,Zphys,XI,YI); %interpolation on the choosen grid
     325        end
    325326       
    326327    end
  • trunk/src/series/civ_series.m

    r977 r981  
    302302        end
    303303    end
    304     if isempty(Time) && ~isempty(find(strcmp(FileType_A,{'mmreader','video'})))% case of video input
     304    if isempty(Time) && ~isempty(find(strcmp(FileType_A,{'mmreader','video','cine_phantom'})))% case of video input
    305305        Time=zeros(FileInfo_A.NumberOfFrames+1,2);
    306306        Time(:,2)=(0:1/FileInfo_A.FrameRate:(FileInfo_A.NumberOfFrames)/FileInfo_A.FrameRate)';
Note: See TracChangeset for help on using the changeset viewer.