Changeset 946


Ignore:
Timestamp:
Jun 2, 2016, 3:38:25 PM (5 years ago)
Author:
sommeria
Message:

read hf5 added

Location:
trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/get_file_info.m

    r935 r946  
    5353    case {'.seq','.sqb'}
    5454        [A,FileInfo,timestamps,errormsg]=read_rdvision(fileinput,[]);
    55        
     55    case '.h5'
     56        hinfo=hdf5info(fileinput);
     57        if strcmp(hinfo.GroupHierarchy.Attributes(1).Value.Data,'MultipassPIVResults')
     58            FileInfo.FileType='pivdata_fluidimage';
     59            FileInfo.CivStage=6; % A MODIFIER
     60        end
    5661    otherwise
    5762        if ~isempty(FileExt)% exclude empty extension
  • trunk/src/uvmat.m

    r945 r946  
    20572057        (strcmp(FileType,'image')|| strcmp(FileType,'multimage'))%||strcmp(FileType,'civdata')||strcmp(FileType,'civx'))
    20582058    TimeName='xml';
    2059 elseif strcmp(FileType,'civdata')
     2059elseif strcmp(FileType,'civdata')% ajouter pivdata_fluidimage
    20602060    TimeName='civdata';
    20612061elseif strcmp(FileType,'civx')
     
    21622162%% set default options in menu 'FieldName'
    21632163switch FileType
    2164     case {'civx','civdata'}
     2164    case {'civx','civdata','pivdata_fluidimage'}
    21652165        [FieldList,ColorList]=set_field_list('U','V','C');
    21662166        set(handles_Fields,'String',[{'image'};FieldList;{'get_field...'}]);%standard menu for civx data
     
    32053205VelType='';%default
    32063206switch UvData.FileType{1}
    3207     case {'civx','civdata','netcdf'};
     3207    case {'civx','civdata','netcdf','pivdata_fluidimage'};
    32083208        list_fields=get(handles.FieldName,'String');% list menu fields
    32093209        FieldName= list_fields{get(handles.FieldName,'Value')}; % selected field
     
    33883388%% update the display menu for the first velocity type (first menuline)
    33893389test_veltype=0;
    3390 if (strcmp(UvData.FileType{1},'civx')||strcmp(UvData.FileType{1},'civdata'))&& ~strcmp(FieldName,'get_field...')
     3390if (strcmp(UvData.FileType{1},'civx')||strcmp(UvData.FileType{1},'civdata')||strcmp(UvData.FileType{1},'pivdata_fluidimage'))...
     3391        && ~strcmp(FieldName,'get_field...')
    33913392    test_veltype=1;
    33923393    set(handles.VelType,'Visible','on')
     
    34133414if isempty(FileName_1)
    34143415elseif ~test_keepdata_1
    3415     if (strcmp(UvData.FileType{2},'civx')||strcmp(UvData.FileType{2},'civdata'))&& ~strcmp(FieldName_1,'get_field...')
     3416    if (strcmp(UvData.FileType{2},'civx')||strcmp(UvData.FileType{2},'civdata')||strcmp(UvData.FileType{1},'pivdata_fluidimage'))...
     3417            && ~strcmp(FieldName_1,'get_field...')
    34163418        test_veltype_1=1;
    34173419        set(handles.VelType_1,'Visible','on')
     
    37143716    %default settings if vectors not visible
    37153717    if ~isfield(PlotParam{1},'Vectors')
    3716         if strcmp(get(handles.VelType,'Visible'),'on')
    37173718        PlotParam{1}.Vectors.MaxVec=1;
    37183719        PlotParam{1}.Vectors.MinVec=0;
     
    37203721        PlotParam{1}.Vectors.ColCode1=0.33;
    37213722        PlotParam{1}.Vectors.ColCode2=0.66;
    3722         PlotParam{1}.Vectors.ColorScalar={'C'};
     3723        PlotParam{1}.Vectors.ColorScalar={''};
    37233724        PlotParam{1}.Vectors.ColorCode= {'rgb'};
    3724         end
    37253725    end
    37263726   
     
    46054605            imax=6;
    46064606        end
    4607     case 'civdata'
     4607    case {'civdata','pivdata_fluidimage'}
    46084608        menu={'civ1';'filter1';'civ2';'filter2'};
    46094609        if isequal(Civ,0)
Note: See TracChangeset for help on using the changeset viewer.