Changeset 946

Timestamp:

Jun 2, 2016, 3:38:25 PM (9 years ago)

Author:

sommeria

Message:

read hf5 added

Location:

trunk/src

Files:

• get_file_info.m (modified) (1 diff)
• uvmat.m (modified) (8 diffs)

trunk/src/get_file_info.m

@@ -53 +53 @@
     case {'.seq','.sqb'}
         [A,FileInfo,timestamps,errormsg]=read_rdvision(fileinput,[]);
-        
+    case '.h5'
+        hinfo=hdf5info(fileinput);
+        if strcmp(hinfo.GroupHierarchy.Attributes(1).Value.Data,'MultipassPIVResults')
+            FileInfo.FileType='pivdata_fluidimage';
+            FileInfo.CivStage=6; % A MODIFIER
+        end
     otherwise
         if ~isempty(FileExt)% exclude empty extension

trunk/src/uvmat.m

@@ -2057 +2057 @@
         (strcmp(FileType,'image')|| strcmp(FileType,'multimage'))%||strcmp(FileType,'civdata')||strcmp(FileType,'civx'))
     TimeName='xml';
-elseif strcmp(FileType,'civdata')
+elseif strcmp(FileType,'civdata')% ajouter pivdata_fluidimage
     TimeName='civdata';
 elseif strcmp(FileType,'civx')
@@ -2162 +2162 @@
 %% set default options in menu 'FieldName'
 switch FileType
-    case {'civx','civdata'}
+    case {'civx','civdata','pivdata_fluidimage'}
         [FieldList,ColorList]=set_field_list('U','V','C');
         set(handles_Fields,'String',[{'image'};FieldList;{'get_field...'}]);%standard menu for civx data
@@ -3205 +3205 @@
 VelType='';%default
 switch UvData.FileType{1}
-    case {'civx','civdata','netcdf'};
+    case {'civx','civdata','netcdf','pivdata_fluidimage'};
         list_fields=get(handles.FieldName,'String');% list menu fields
         FieldName= list_fields{get(handles.FieldName,'Value')}; % selected field
@@ -3388 +3388 @@
 %% update the display menu for the first velocity type (first menuline)
 test_veltype=0;
-if (strcmp(UvData.FileType{1},'civx')||strcmp(UvData.FileType{1},'civdata'))&& ~strcmp(FieldName,'get_field...')
+if (strcmp(UvData.FileType{1},'civx')||strcmp(UvData.FileType{1},'civdata')||strcmp(UvData.FileType{1},'pivdata_fluidimage'))...
+        && ~strcmp(FieldName,'get_field...')
     test_veltype=1;
     set(handles.VelType,'Visible','on')
@@ -3413 +3414 @@
 if isempty(FileName_1)
 elseif ~test_keepdata_1
-    if (strcmp(UvData.FileType{2},'civx')||strcmp(UvData.FileType{2},'civdata'))&& ~strcmp(FieldName_1,'get_field...')
+    if (strcmp(UvData.FileType{2},'civx')||strcmp(UvData.FileType{2},'civdata')||strcmp(UvData.FileType{1},'pivdata_fluidimage'))...
+            && ~strcmp(FieldName_1,'get_field...')
         test_veltype_1=1;
         set(handles.VelType_1,'Visible','on')
@@ -3714 +3716 @@
     %default settings if vectors not visible
     if ~isfield(PlotParam{1},'Vectors')
-        if strcmp(get(handles.VelType,'Visible'),'on')
         PlotParam{1}.Vectors.MaxVec=1;
         PlotParam{1}.Vectors.MinVec=0;
@@ -3720 +3721 @@
         PlotParam{1}.Vectors.ColCode1=0.33;
         PlotParam{1}.Vectors.ColCode2=0.66;
-        PlotParam{1}.Vectors.ColorScalar={'C'};
+        PlotParam{1}.Vectors.ColorScalar={''};
         PlotParam{1}.Vectors.ColorCode= {'rgb'};
-        end
     end
     
@@ -4605 +4605 @@
             imax=6;
         end
-    case 'civdata'
+    case {'civdata','pivdata_fluidimage'}
         menu={'civ1';'filter1';'civ2';'filter2'};
         if isequal(Civ,0)