Changeset 783 for trunk/src/series


Ignore:
Timestamp:
Jun 5, 2014, 10:39:28 PM (11 years ago)
Author:
sommeria
Message:

-pb of mulitple tiff reading solved
-modif of output parma in get-file_type and find_file_series

  • introduction of transform/ima_noise_rms
Location:
trunk/src/series
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/series/aver_stat.m

    r751 r783  
    121121        return
    122122    end
    123     [FileType{iview},FileInfo{iview},MovieObject{iview}]=get_file_type(filecell{iview,1});
     123    [FileInfo{iview},MovieObject{iview}]=get_file_type(filecell{iview,1});
     124    FileType{iview}=FileInfo{iview}.FileType;
    124125    CheckImage{iview}=~isempty(find(strcmp(FileType{iview},ImageTypeOptions)));% =1 for images
    125126    CheckNc{iview}=~isempty(find(strcmp(FileType{iview},NcTypeOptions)));% =1 for netcdf files

  • trunk/src/series/aver_synchro.m

    r751 r783  
    9393FileExt=Param.InputTable(:,5);
    9494[filecell,i1_series,i2_series,j1_series,j2_series]=get_file_series(Param);
    95  [FileType,FileInfo]=get_file_type(filecell{1,1});
     95FileInfo=get_file_type(filecell{1,1});
     96 FileType=FileInfo.FileType;
    9697%%%%%%%%%%%%
    9798% The cell array filecell is the list of input file names, while

  • trunk/src/series/beam_forming.m

    r782 r783  
    8282        return
    8383    end
    84     [FileType{iview},FileInfo{iview},MovieObject{iview}]=get_file_type(filecell{iview,1});
     84    [FileInfo{iview},MovieObject{iview}]=get_file_type(filecell{iview,1});
     85    FileType{iview}=FileInfo{iview}.FileType;
    8586    CheckImage{iview}=~isempty(find(strcmp(FileType{iview},ImageTypeOptions)));% =1 for images
    8687    CheckNc{iview}=~isempty(find(strcmp(FileType{iview},NcTypeOptions)));% =1 for netcdf files

  • trunk/src/series/check_data_files.m

    r649 r783  
    9292NcTypeOptions={'netcdf','civx','civdata'};
    9393for iview=1:nbview
    94     [FileType{iview},FileInfo{iview},Object{iview}]=get_file_type(filecell{iview,1});
     94    [FileInfo{iview},Object{iview}]=get_file_type(filecell{iview,1});
     95    FileType{iview}=FileInfo{iview}.FileType;
    9596    CheckImage{iview}=~isempty(find(strcmp(FileType{iview},ImageTypeOptions)));% =1 for images
    9697    CheckNc{iview}=~isempty(find(strcmp(FileType{iview},NcTypeOptions)));% =1 for netcdf files
    … …  
    100101for iview=1:nbview
    101102    if isequal(FileType{iview},'mmreader')||isequal(FileType{iview},'video')||isequal(FileType{iview},'multimage')
    102         [tild,FileInfo]=get_file_type(filecell{iview,1});
     103        [FileInfo]=get_file_type(filecell{iview,1});
    103104        Tabchar{1}=filecell{iview,1};%info.Filename;
    104105        Tabchar{2}='';
    105106        Tabchar{3}=[num2str(FileInfo.FrameRate) ' frames/s '];
    106107        message='';
    107         %         Tabchar{4}='';
    108         %         Tabchar{5}=['  compression' FileInfo.VideoCompression];
    109         %         Tabchar{6}=[ 'quality ' num2str(FileInfo.Quality)];
    110108    else
    111109        Tabchar={};
    … …  
    133131                    end
    134132                    lastfield='';
    135                     [FileType{iview},FileInfo,Object]=get_file_type(file);
     133                    [FileInfo,Object]=get_file_type(file);
     134                    FileType{iview}=FileInfo.FileType;
    136135                    if strcmp(FileType{iview},'civx')||strcmp(FileType{iview},'civdata')
    137136                        if isfield(FileInfo,'CivStage')

  • trunk/src/series/check_peaklock.m

    r668 r783  
    113113        return
    114114    end
    115     [FileType{iview},FileInfo{iview},MovieObject{iview}]=get_file_type(filecell{iview,1});
     115    [FileInfo{iview},MovieObject{iview}]=get_file_type(filecell{iview,1});
     116    FileType{iview}=FileInfo{iview}.FileType;
    116117    CheckImage{iview}=~isempty(find(strcmp(FileType{iview},ImageTypeOptions)));% =1 for images
    117118    CheckNc{iview}=~isempty(find(strcmp(FileType{iview},NcTypeOptions)));% =1 for netcdf files

  • trunk/src/series/civ_input.m

    r781 r783  
    20682068 Data.CoordUnit='pixel';% used to set equal scaling for x and y in image dispa=ly
    20692069 par_civ1=read_GUI(handles.Civ1);
    2070  par_civ1.FileTypeA=get_file_type(ImageName_A);
     2070 FileInfo=get_file_type(ImageName_A);
     2071 par_civ1.FileTypeA=FileInfo.FileType;
    20712072 par_civ1.ImageWidth=size(Data.A,2);
    20722073 par_civ1.ImageHeight=size(Data.A,1);

  • trunk/src/series/civ_series.m

    r782 r783  
    220220            return
    221221        end
    222         [FileType_A,FileInfo_A,VideoObject_A]=get_file_type(ImageName_A);
     222        [FileInfo_A,VideoObject_A]=get_file_type(ImageName_A);
     223        FileType_A=FileInfo_A.FileType;
    223224        if strcmp(FileInfo_A.FileType,'netcdf')
    224225            FieldName_A=Param.InputFields.FieldName;
    … …  
    233234            return
    234235        end
    235         [FileType_B,FileInfo_B,VideoObject_B]=get_file_type(ImageName_B);
     236        [FileInfo_B,VideoObject_B]=get_file_type(ImageName_B);
     237        FileType_B=FileInfo_B.FileType;
    236238        if strcmp(FileInfo_B.FileType,'netcdf')
    237239            FieldName_B=Param.InputFields.FieldName;
    … …  
    255257            return
    256258        end
    257         [FileType_B,FileInfo_B,VideoObject_B]=get_file_type(ImageName_B);
     259        [FileInfo_B,VideoObject_B]=get_file_type(ImageName_B);
     260        FileType_B=FileInfo_B.FileType;
    258261        [par_civ1.ImageB,VideoObject_B] = read_image(ImageName_B,FileType_B,VideoObject_B,FrameIndex_B_Civ2(1));
    259262        NbField=numel(i1_series_Civ2);

  • trunk/src/series/float_tracking.m

    r635 r783  
    124124
    125125%% check the input file type 
    126 [FileType,FileInfo,VideoObject]=get_file_type(filecell{1,1});
     126[FileInfo,VideoObject]=get_file_type(filecell{1,1});
     127FileType=FileInfo.FileType;
    127128ImageTypeOptions={'image','multimage','mmreader','video'};
    128129if isempty(find(strcmp(FileType,ImageTypeOptions)))

  • trunk/src/series/ima_levels.m

    r635 r783  
    6565        msgbox_uvmat('WARNING','the first input file does not exist')
    6666    else
    67         FileType=get_file_type(filecell{1,1});
     67        FileInfo=get_file_type(filecell{1,1});
     68        FileType=FileInfo.FileType;
    6869        if isempty(find(strcmp(FileType,{'image','multimage','mmreader','video'})));% =1 for images
    6970            msgbox_uvmat('ERROR',['bad input file type for ' mfilename ': an image is needed'])
    … …  
    106107nbfield_i=size(i1_series{1},2); %nb of fields for the i index
    107108nbfield=nbfield_j*nbfield_i; %total number of fields
    108 [FileType{1},FileInfo{1},VideoObject{1}]=get_file_type(filecell{1,1});% type of input file
     109[FileInfo{1},VideoObject{1}]=get_file_type(filecell{1,1});% type of input file
     110FileType{1}=FileInfo{1}.FileType;
    109111
    110112%% frame index for movie or multimage file input 

  • trunk/src/series/merge_proj.m

    r746 r783  
    121121        return
    122122    end
    123     [FileType{iview},FileInfo{iview},MovieObject{iview}]=get_file_type(filecell{iview,1});
     123    [FileInfo{iview},MovieObject{iview}]=get_file_type(filecell{iview,1});
     124    FileType{iview}=FileInfo{iview}.FileType;
    124125    CheckImage{iview}=~isempty(find(strcmp(FileType{iview},ImageTypeOptions)));% =1 for images
    125126    CheckNc{iview}=~isempty(find(strcmp(FileType{iview},NcTypeOptions)));% =1 for netcdf files

  • trunk/src/series/merge_proj_special.m

    r712 r783  
    114114        return
    115115    end
    116     [FileType{iview},FileInfo{iview},MovieObject{iview}]=get_file_type(filecell{iview,1});
     116    [FileInfo{iview},MovieObject{iview}]=get_file_type(filecell{iview,1});
     117    FileType{iview}=FileInfo{iview}.FileType;
    117118    CheckImage{iview}=~isempty(find(strcmp(FileType{iview},ImageTypeOptions)));% =1 for images
    118119    CheckNc{iview}=~isempty(find(strcmp(FileType{iview},NcTypeOptions)));% =1 for netcdf files

  • trunk/src/series/particle_tracking.m

    r635 r783  
    124124
    125125%% check the input file type 
    126 [FileType,FileInfo,VideoObject]=get_file_type(filecell{1,1});
     126[FileInfo,VideoObject]=get_file_type(filecell{1,1});
     127FileType=FileInfo.FileType;
    127128ImageTypeOptions={'image','multimage','mmreader','video'};
    128129if isempty(find(strcmp(FileType,ImageTypeOptions)))

  • trunk/src/series/relabel_i_j.m

    r736 r783  
    9595    return
    9696end
    97 [FileType{1},FileInfo{1},MovieObject{1}]=get_file_type(filecell{1,1});
     97[FileInfo{1},MovieObject{1}]=get_file_type(filecell{1,1});
     98FileType{1}=FileInfo{1}.FileType;
    9899CheckImage=~isempty(find(strcmp(FileType{1},ImageTypeOptions)));% =1 for images
    99100

  • trunk/src/series/sub_background.m

    r774 r783  
    9090    %% check the validity of  input file types
    9191    ImageTypeOptions={'image','multimage','mmreader','video'};%allowed input file types(images)
    92     FileType=get_file_type(FirstFileName);
     92    FileInfo=get_file_type(FirstFileName);
     93    FileType=FileInfo.FileType;
    9394    CheckImage=~isempty(find(strcmp(FileType,ImageTypeOptions), 1));% =1 for images
    9495    if ~CheckImage
    … …  
    200201    % i1_series(iview,fileindex) expresses the same indices as a 1D array in file indices
    201202%%%%%%%%%%%%
    202 [FileType{1},FileInfo{1},MovieObject{1}]=get_file_type(filecell{1,1});
     203[FileInfo{1},MovieObject{1}]=get_file_type(filecell{1,1});
     204FileType{1}=FileInfo{1}.FileType;
    203205    if ~isempty(j1_series{1})
    204206        frame_index{1}=j1_series{1};

  • trunk/src/series/time_series.m

    r768 r783  
    124124        return
    125125    end
    126     [FileType{iview},FileInfo{iview},MovieObject{iview}]=get_file_type(filecell{iview,1});
     126    [FileInfo{iview},MovieObject{iview}]=get_file_type(filecell{iview,1});
     127    FileType{iview}=FileInfo{iview}.FileType;
    127128    if strcmp(FileType{iview},'civdata')||strcmp(FileType{iview},'civx')
    128129        if ~isfield(Param.InputFields,'VelType')

  • trunk/src/series/turb_stat.m

    r761 r783  
    103103        return
    104104    end
    105     [FileType{iview},FileInfo{iview},MovieObject{iview}]=get_file_type(filecell{iview,1});
     105    [FileInfo{iview},MovieObject{iview}]=get_file_type(filecell{iview,1});
     106    FileType{iview}=FileInfo{iview}.FileType;
    106107    CheckImage{iview}=~isempty(find(strcmp(FileType{iview},ImageTypeOptions)));% =1 for images
    107108    CheckNc{iview}=~isempty(find(strcmp(FileType{iview},NcTypeOptions)));% =1 for netcdf files
Note: See TracChangeset for help on using the changeset viewer.