Changeset 1040 for trunk

Timestamp:

May 4, 2018, 10:57:13 PM (7 years ago)

Author:

sommeria

Message:

get_field improved to select variables, uvmat rationalized with respect to input file types

Location:

trunk/src

Files:

• get_field.m (modified) (16 diffs)
• get_file_info.m (modified) (2 diffs)
• series.m (modified) (1 diff)
• uvmat.m (modified) (16 diffs)

trunk/src/get_field.m

@@ -335 +335 @@
         return
     end
-    var_select=list_var{index};
-    set(handles.attributes_txt,'String', ['attributes of ' var_select])
+    VarName=list_var{index};
+    set(handles.attributes_txt,'String', ['attributes of ' VarName])
     if isfield(Field,'VarAttribute')&& length(Field.VarAttribute)>=index-1
-        %         nbline=0;
         VarAttr=Field.VarAttribute{index-1};
         if isstruct(VarAttr)
@@ -356 +355 @@
 if ~isempty(Tabcell)
     Tabchar=cell2tab(Tabcell,'=');
-    %     Tabchar=[{''};Tabchar];
 end
 set(handles.attributes,'Value',1);% select the first item
@@ -364 +362 @@
 if isfield(Field,'ListDimName')
     Tabdim={};%default
-    if isequal(index,1)%list all dimensions
+    if isequal(index,1)%list all dimensions if '*' is selected as the variable
         dim_indices=1:length(Field.ListDimName);
         set(handles.dimensions_txt,'String', 'dimensions')
-    else
+    else   % a specific variable has been selected
         DimCell=Field.VarDimName{index-1};
         if ischar(DimCell)
-            DimCell={DimCell};
+            DimCell={DimCell};% transform into a cell for a single dimension defined by a char string
         end
         dim_indices=[];
@@ -378 +376 @@
             dim_indices=[dim_indices dim_index];
         end
-        set(handles.dimensions_txt,'String', ['dimensions of ' var_select])
+        set(handles.dimensions_txt,'String', ['dimensions of ' VarName])
     end
     for iline=1:length(dim_indices)
@@ -390 +388 @@
 end
 
+%% propose a plot by default if a variable has been selected
+if ~isequal(index,1)
+    if numel(DimCell)==1
+        set(handles.FieldOption,'Value',1)%propose 1D plot
+    else
+        set(handles.FieldOption,'Value',2)%propose scalar plot
+    end
+    if numel(DimCell)<=2
+        set(handles.Check3D,'Value',0)
+    else
+        set(handles.Check3D,'Value',1)
+    end
+    FieldOption_Callback(hObject, VarName, handles)
+end
+
 %------------------------------------------------------------------------
 % --- Executes on selection change in FieldOption.
 %------------------------------------------------------------------------
-function FieldOption_Callback(hObject, eventdata, handles)
+function FieldOption_Callback(hObject, VarName, handles)
 
 Field=get(handles.get_field,'UserData');
@@ -414 +427 @@
         set(handles.Coord_z,'Visible','off')
         set(handles.Z_title,'Visible','off')
-        ordinate_Callback(hObject, eventdata, handles)
+        ordinate_Callback(hObject, VarName, handles)
         
     case {'scalar'}
@@ -428 +441 @@
         set(handles.Coord_y,'Visible','on')
         set(handles.Y_title,'Visible','on')
+        
+        if ~ischar(VarName)
+            
         %default scalar selection
         test_coord=zeros(size(Field.Display.VarDimName)); %=1 when variable #ilist is eligible as structured coordiante
@@ -447 +463 @@
         else
             set(handles.scalar,'Value',scalar_index)
-        end       
-        scalar_Callback(hObject, eventdata, handles)
+        end      
+        end
+        scalar_Callback(hObject,VarName, handles)
+        
              
     case 'vectors'
@@ -501 +519 @@
 
 %------------------------------------------------------------------------
-function ordinate_Callback(hObject, eventdata, handles)
+function ordinate_Callback(hObject, DimCell, handles)
 %------------------------------------------------------------------------
 Field=get(handles.get_field,'UserData');
@@ -584 +602 @@
         set(handles.TimeName,'String',ListTime)
 end  
+if ~ischar(DimCell)
 update_field(handles,YName)
+end
          
 %------------------------------------------------------------------------
 % --- Executes on selection change in scalar menu.
 %------------------------------------------------------------------------
-function scalar_Callback(hObject, eventdata, handles)
+function scalar_Callback(hObject, VarName, handles)
 
 Field=get(handles.get_field,'UserData');
-scalar_index=get(handles.scalar,'Value');
 scalar_menu=get(handles.scalar,'String');
-ScalarName=scalar_menu{scalar_index};
+if ischar(VarName)
+    ScalarName=VarName;
+    scalar_index=find(strcmp(VarName,scalar_menu));
+    set(handles.scalar,'Value',scalar_index)
+else
+    scalar_index=get(handles.scalar,'Value');
+        ScalarName=scalar_menu{scalar_index};
+end
 
 %% set list of possible coordinates
@@ -696 +722 @@
         set(handles.TimeName,'String',ListTime)
 end  
+if ~ischar(VarName)
 update_field(handles,ScalarName)
+end
 
 % --- Executes on button press in check_rgb.
@@ -705 +733 @@
 % --- Executes on selection change in vector_x.
 %------------------------------------------------------------------------
-function vector_x_Callback(hObject, eventdata, handles)
+function vector_x_Callback(hObject, DimCell, handles)
 
 vector_x_menu=get(handles.vector_x,'String');
@@ -711 +739 @@
 vector_x=vector_x_menu{vector_x_index};
 vector_Callback(handles)
+if ~ischar(DimCell)
 update_field(handles,vector_x)
+end
 
 %------------------------------------------------------------------------
 % --- Executes on selection change in vector_x.
-function vector_y_Callback(hObject, eventdata, handles)
-%------------------------------------------------------------------------
+%------------------------------------------------------------------------
+function vector_y_Callback(hObject, DimCell, handles)
+
 vector_y_menu=get(handles.vector_x,'String');
 vector_y_index=get(handles.vector_x,'Value');
 vector_y=vector_y_menu{vector_y_index};
 vector_Callback(handles)
+if ~ischar(DimCell)
 update_field(handles,vector_y)
+end
 
 %------------------------------------------------------------------------
 % --- Executes on selection change in vector_z.
-function vector_z_Callback(hObject, eventdata, handles)
+function vector_z_Callback(hObject, DimCell, handles)
 %------------------------------------------------------------------------
 vector_z_menu=get(handles.vector_z,'String');
@@ -731 +764 @@
 vector_z=vector_z_menu{vector_z_index};
 vector_Callback(handles)
+if ~ischar(DimCell)
 update_field(handles,vector_z)
-
+end
 %------------------------------------------------------------------------
 % --- Executes on selection change in vec_color.
-function vec_color_Callback(hObject, eventdata, handles)
+function vec_color_Callback(hObject, DimCell, handles)
 %------------------------------------------------------------------------
 index=get(handles.vec_color,'Value');
@@ -741 +775 @@
 VarName=string{index};
 vector_Callback(handles)
+if ~ischar(DimCell)
 update_field(handles,VarName)
-
+end
 %------------------------------------------------------------------------
 % --- Executes on selection change in vector_x or vector_y
@@ -860 +895 @@
 % --- Executes on selection change in Coord_x.
 %------------------------------------------------------------------------
-function Coord_x_Callback(hObject, eventdata, handles)
+function Coord_x_Callback(hObject, DimCell, handles)
 
 index=get(handles.Coord_x,'Value');
 string=get(handles.Coord_x,'String');
 VarName=string{index};
+if ~ischar(DimCell)
 update_field(handles,VarName)
-
+end
 %------------------------------------------------------------------------
 % --- Executes on selection change in Coord_y.
 %------------------------------------------------------------------------
-function Coord_y_Callback(hObject, eventdata, handles)
+function Coord_y_Callback(hObject, DimCell, handles)
 
 index=get(handles.Coord_y,'Value');
 string=get(handles.Coord_y,'String');
 VarName=string{index};
+if ~ischar(DimCell)
 update_field(handles,VarName)
+end
 
 %------------------------------------------------------------------------
 % --- Executes on selection change in Coord_z.
 %------------------------------------------------------------------------
-function Coord_z_Callback(hObject, eventdata, handles)
+function Coord_z_Callback(hObject, DimCell, handles)
 
 index=get(handles.Coord_z,'Value');
 string=get(handles.Coord_z,'String');
 VarName=string{index};
+if ~ischar(DimCell)
 update_field(handles,VarName)
+end
 
 %------------------------------------------------------------------------

trunk/src/get_file_info.m

@@ -22 +22 @@
 %               ='civx': netcdf files provided by the obsolete program civx (in fortran)
 %               ='pivdata_fluidimage': PIV data from software 'fluidimage'
-%      .FileIndexing='on' for data files (when series of indexed files are  expected)
+%      .FieldType='image' for all kinds of images and movies, =FileType  else
+%      .FileIndexing='on'/'off', for data files (when series of indexed files are  expected)
 %      .Height: image height in pixels
 %      .Width:  image width in pixels
 %      .BitDepth: nbre of bits per pixel  (8 of 16)
 %      .ColorType: 'greyscale' or 'color'
-%      .NumberOfFrames
+%      .NumberOfFrames: defined for images or movies
 %      .FrameRate: nbre of frames per second, =[] for images
 % VideoObject: in case of video
@@ -58 +59 @@
     FileInfo.FileType='txt'; %default
 else
-    FileInfo.FileType='';
+    FileInfo.FileType='';% input file does not exist
     return
 end

trunk/src/series.m

@@ -2183 +2183 @@
 %% add a new function to the menu if 'more...' has been selected in the menu ActionName
 if isequal(ActionName,'more...')
-    if isempty(ActionPath)
+    if ~ischar(ActionPath)
         ActionPath=get(handles.ActionPath,'String');
     end

trunk/src/uvmat.m

@@ -3167 +3167 @@
 %% read the second field
 if isempty(UvData.MovieObject)
-    [Field_b,ParamOut,errormsg] = read_field(imaname_1,UvData.FileType{index},[],num_frame);
-else
-    [Field_b,ParamOut,errormsg] = read_field(imaname_1,UvData.FileType{1},UvData.MovieObject{1},num_frame);
+    [Field_b,ParamOut,errormsg] = read_field(imaname_1,UvData.FileInfo{index}.FileType,[],num_frame);
+else
+    [Field_b,ParamOut,errormsg] = read_field(imaname_1,UvData.FileInfo{1}.FileType,UvData.MovieObject{1},num_frame);
 end
 if ~isempty(errormsg)
@@ -3304 +3304 @@
 %% test for need of tps
 check_proj_tps=0;
-if  (strcmp(UvData.FileType{1},'civdata')||strcmp(UvData.FileType{1},'civx'))
+if  (strcmp(UvData.FileInfo{1}.FileType,'civdata')||strcmp(UvData.FileInfo{1}.FileType,'civx'))
     for iobj=1:numel(UvData.ProjObject)
         if isfield(UvData.ProjObject{iobj},'ProjMode')&& strcmp(UvData.ProjObject{iobj}.ProjMode,'interp_tps')
@@ -3318 +3318 @@
 FieldName='';%default
 VelType='';%default
-switch UvData.FileType{1}
+if strcmp(UvData.FileInfo{1}.FieldType,'image')
+    FieldName='image';
+    frame_index=1;%default
+    if UvData.FileInfo{1}.NumberOfFrames>1
+        if strcmp(NomType,'*')
+            if num_i1>UvData.FileInfo{1}.NumberOfFrames
+                errormsg='specified frame index exceeds file content';
+                return
+            else
+                frame_index=num_i1;%frame index from a single movies or multimage
+            end
+        else
+            if num_j1>UvData.FileInfo{1}.NumberOfFrames
+                errormsg='specified frame index exceeds file content';
+                return
+            else
+                frame_index=num_j1;% frame index from a set of indexed movies
+            end
+        end
+    end
+    if isfield(UvData,'MovieObject')
+        ParamIn=UvData.MovieObject{1};
+    end
+end
+switch UvData.FileInfo{1}.FileType
     case {'civx','civdata','netcdf','pivdata_fluidimage'};
         list_fields=get(handles.FieldName,'String');% list menu fields
@@ -3338 +3362 @@
             end
         end
-    case {'video','mmreader','rdvision','cine_phantom'}
-        FieldName='image';
-        ParamIn=UvData.MovieObject{1}; % movie object
-        if strcmp(NomType,'*')
-            frame_index=num_i1;%frame index from a single movies or multimage
-        else
-            frame_index=num_j1;% frame index from a set of indexed movies
-        end
-        if isempty(frame_index)
-            frame_index=1; 
-        end
-    case 'multimage'
-        FieldName='image';
-        if ~strcmp(NomType,'*')
-            MaxIndex_j_cell=get(handles.MaxIndex_j,'String');
-            if num_j1>str2num(MaxIndex_j_cell{1})
-                errormsg='specified frame index exceeds file content';
-                return
-            else
-            frame_index=num_j1;%frame index for movies or multimage
-            end
-        else
-            MaxIndex_i_cell=get(handles.MaxIndex_i,'String');
-            if num_i1>str2num(MaxIndex_i_cell{1})
-                errormsg='specified frame index exceeds file content';
-                return
-            else
-            frame_index=num_i1;
-            end
-        end
     case 'vol' %TODO: update
         if isfield(UvData.XmlData,'Npy') && isfield(UvData.XmlData,'Npx')
@@ -3376 +3370 @@
             return
         end
-    case {'image','image_DaVis'}
-        FieldName='image';  
-        frame_index=num_j1;%frame index for image pairs
 end
 if isstruct (ParamIn)
@@ -3399 +3390 @@
 end
 
-[Field{1},ParamOut,errormsg] = read_field(FileName,UvData.FileType{1},ParamIn,frame_index);
+[Field{1},ParamOut,errormsg] = read_field(FileName,UvData.FileInfo{1}.FileType,ParamIn,frame_index);
 if ~isempty(errormsg)
     errormsg=['uvmat / refresh_field / read_field( ' FileName ') / ' errormsg];
@@ -3411 +3402 @@
 
 %% choose and read a second field FileName_1 if defined
-VelType_1=[];%default
-FieldName_1=[];
-ParamIn_1=[];
 ParamOut_1=[];
-frame_index_1=1;
-if ~isempty(FileName_1)
-    if ~exist(FileName_1,'file')
-        errormsg=['second file ' FileName_1 ' does not exist'];
-        return
-    end
-    switch UvData.FileType{2}
-        case {'civx','civdata','netcdf'};
+if numel(UvData.FileInfo)>1
+    VelType_1=[];%default
+    FieldName_1=[];
+    ParamIn_1=[];
+ 
+    frame_index_1=1;
+    if ~isempty(FileName_1)
+        if ~exist(FileName_1,'file')
+            errormsg=['second file ' FileName_1 ' does not exist'];
+            return
+        end
+    end
+    if isequal(get(handles.NomType_1,'Visible'),'on')
+        NomType_1=get(handles.NomType_1,'String');
+    else
+        NomType_1=get(handles.NomType,'String');
+    end
+    if strcmp(UvData.FileInfo{2}.FieldType,'image')
+        FieldName_1='image';
+        frame_index_1=1;%default
+        if UvData.FileInfo{2}.NumberOfFrames>1
+            if strcmp(NomType_1,'*')
+                if num_i1>UvData.FileInfo{2}.NumberOfFrames
+                    errormsg='specified frame index exceeds file content';
+                    return
+                else
+                    frame_index_1=num_i1;%frame index from a single movies or multimage
+                end
+            else
+                if num_j1>UvData.FileInfo{2}.NumberOfFrames
+                    errormsg='specified frame index exceeds file content';
+                    return
+                else
+                    frame_index_1=num_j1;% frame index from a set of indexed movies
+                end
+            end
+        end
+        if isfield(UvData,'MovieObject')
+            ParamIn_1=UvData.MovieObject{2};
+        end
+    end
+    switch UvData.FileInfo{2}.FileType
+        case {'civx','civdata','netcdf','pivdata_fluidimage'};
             list_fields=get(handles.FieldName_1,'String');% list menu fields
-            if ischar(list_fields),list_fields={list_fields};end
             FieldName_1= list_fields{get(handles.FieldName_1,'Value')}; % selected field
             if ~strcmp(FieldName_1,'get_field...')
                 if get(handles.FixVelType,'Value')
                     VelTypeList=get(handles.VelType_1,'String');
-                    VelType_1=VelTypeList{get(handles.VelType_1,'Value')};% read the velocity type.
+                    VelType_1=VelTypeList{get(handles.VelType_1,'Value')};
                 end
             end
-            if isempty(FieldName_1)
-                FieldName_1=FieldName;% if blank reproduce the field name of the first field
-            end
-            if ~isempty(regexp(FieldName_1,'^vel', 'once'))&& strcmp(get(handles.ColorCode,'Visible'),'on')
+            % case of input vector field, get the scalar used for vector color
+            if ~isempty(regexp(FieldName_1,'^vec('))
                 list_code=get(handles.ColorCode,'String');% list menu fields
                 index_code=get(handles.ColorCode,'Value');% selected string index
@@ -3441 +3461 @@
                     list_code=get(handles.ColorScalar,'String');% list menu fields
                     index_code=get(handles.ColorScalar,'Value');% selected string index
-                    ParamIn_1.ColorVar= list_code{index_code}; % selected field for vector color display
+                    ParamIn_1.ColorVar= list_code{index_code}; % selected field
                 end
-            end
-        case {'video','mmreader','cine_phantom'}
-            ParamIn_1=UvData.MovieObject{2};
-            if ~strcmp(NomType_1,'*')
-                frame_index_1=j1_1;%frame index for movies or multimage
-            else
-                frame_index_1=i1_1;
-            end
-         case 'multimage'
-            if strcmp(NomType_1,'*')%frame index for movies or multimage
-                frame_index_1=i1_1;
-            else
-                frame_index_1=j1_1;
             end
         case 'vol' %TODO: update
@@ -3466 +3473 @@
             end
     end
-    if isequal(get(handles.NomType_1,'Visible'),'on')
-        NomType_1=get(handles.NomType_1,'String');
-    else
-        NomType_1=get(handles.NomType,'String');
-    end
+    %     switch UvData.FileType{2}
+    %         case {'civx','civdata','netcdf'};
+    %             list_fields=get(handles.FieldName_1,'String');% list menu fields
+    %             if ischar(list_fields),list_fields={list_fields};end
+    %             FieldName_1= list_fields{get(handles.FieldName_1,'Value')}; % selected field
+    %             if ~strcmp(FieldName_1,'get_field...')
+    %                 if get(handles.FixVelType,'Value')
+    %                     VelTypeList=get(handles.VelType_1,'String');
+    %                     VelType_1=VelTypeList{get(handles.VelType_1,'Value')};% read the velocity type.
+    %                 end
+    %             end
+    %             if isempty(FieldName_1)
+    %                 FieldName_1=FieldName;% if blank reproduce the field name of the first field
+    %             end
+    %             if ~isempty(regexp(FieldName_1,'^vel', 'once'))&& strcmp(get(handles.ColorCode,'Visible'),'on')
+    %                 list_code=get(handles.ColorCode,'String');% list menu fields
+    %                 index_code=get(handles.ColorCode,'Value');% selected string index
+    %                 if  ~strcmp(list_code{index_code},'black') &&  ~strcmp(list_code{index_code},'white')
+    %                     list_code=get(handles.ColorScalar,'String');% list menu fields
+    %                     index_code=get(handles.ColorScalar,'Value');% selected string index
+    %                     ParamIn_1.ColorVar= list_code{index_code}; % selected field for vector color display
+    %                 end
+    %             end
+    %         case {'video','mmreader','cine_phantom'}
+    %             ParamIn_1=UvData.MovieObject{2};
+    %             if ~strcmp(NomType_1,'*')
+    %                 frame_index_1=j1_1;%frame index for movies or multimage
+    %             else
+    %                 frame_index_1=i1_1;
+    %             end
+    %          case 'multimage'
+    %             if strcmp(NomType_1,'*')%frame index for movies or multimage
+    %                 frame_index_1=i1_1;
+    %             else
+    %                 frame_index_1=j1_1;
+    %             end
+    %         case 'vol' %TODO: update
+    %             if isfield(UvData.XmlData,'Npy') && isfield(UvData.XmlData,'Npx')
+    %                 ParamIn_1.Npy=UvData.XmlData.Npy;
+    %                 ParamIn_1.Npx=UvData.XmlData.Npx;
+    %             else
+    %                 errormsg='Npx and Npy need to be defined in the xml file for volume images .vol';
+    %                 return
+    %             end
+    %     end
+    
     test_keepdata_1=0;% test for keeping the previous stored data if the input files are unchanged
-%     if ~isequal(NomType_1,'*')&& isfield(UvData,'FileName_1')
-%            test_keepdata_1= strcmp(FileName_1,UvData.FileName_1) ;
-%     end
     if test_keepdata_1
         Field{2}=UvData.Field_1;% keep the stored field
@@ -3480 +3525 @@
     else
         if isempty(ParamIn_1) || isstruct(ParamIn_1)
-        ParamIn_1.FieldName=FieldName_1;
-        ParamIn_1.VelType=VelType_1;
-        ParamIn_1.Coord_x=get(handles.Coord_x,'String');
-        ParamIn_1.Coord_y=get(handles.Coord_y,'String');
+            ParamIn_1.FieldName=FieldName_1;
+            ParamIn_1.VelType=VelType_1;
+            ParamIn_1.Coord_x=get(handles.Coord_x,'String');
+            ParamIn_1.Coord_y=get(handles.Coord_y,'String');
         end
         [Field{2},ParamOut_1,errormsg] = read_field(FileName_1,UvData.FileType{2},ParamIn_1,frame_index_1);
@@ -3510 +3555 @@
 %% 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(UvData.FileType{1},'pivdata_fluidimage'))...
+if (strcmp(UvData.FileInfo{1}.FileType,'civx')||strcmp(UvData.FileInfo{1}.FileType,'civdata')||strcmp(UvData.FileInfo{1}.FileType,'pivdata_fluidimage'))...
         && ~strcmp(FieldName,'get_field...')
     test_veltype=1;
@@ -3516 +3561 @@
     set(handles.VelType_1,'Visible','on')
     set(handles.FixVelType,'Visible','on')
-    menu=set_veltype_display(ParamOut.CivStage,UvData.FileType{1});
+    menu=set_veltype_display(ParamOut.CivStage,UvData.FileInfo{1}.FileType);
     index_menu=strcmp(ParamOut.VelType,menu);%look for VelType in  the menu
     index_val=find(index_menu,1);
@@ -3536 +3581 @@
 if isempty(FileName_1)
 elseif ~test_keepdata_1
-    if (strcmp(UvData.FileType{2},'civx')||strcmp(UvData.FileType{2},'civdata')||strcmp(UvData.FileType{1},'pivdata_fluidimage'))...
+    if (strcmp(UvData.FileType{2},'civx')||strcmp(UvData.FileType{2},'civdata')||strcmp(UvData.FileInfo{1}.FileType,'pivdata_fluidimage'))...
             && ~strcmp(FieldName_1,'get_field...')
         test_veltype_1=1;
@@ -4514 +4559 @@
             set(handles.ColorScalar,'Value',1)
             set(handles.ColorScalar,'String',VecColorList);
-            UvData.FileType{1}='netcdf';
+            UvData.FileInfo{1}.FileType='netcdf';
             set(handles.uvmat,'UserData',UvData)
             REFRESH_Callback(hObject, eventdata, handles)
@@ -4711 +4756 @@
             set(handles.FileExt_1,'String',get(handles.FileExt,'String'))
 
-            UvData.FileType{2}=UvData.FileType{1};
+            UvData.FileType{2}=UvData.FileInfo{1}.FileType;
             UvData.XmlData{2}= UvData.XmlData{1};
             transform=get(handles.TransformPath,'UserData');
@@ -4812 +4857 @@
 else% we introduce the same file (with a different field) for the second series
      FileName_1=FileName;% we compare two fields in the same file
-     UvData.FileType{2}=UvData.FileType{1};
+     UvData.FileType{2}=UvData.FileInfo{1}.FileType;
      UvData.XmlData{2}= UvData.XmlData{1};
      set(handles.SubField,'Value',1)