Changeset 1030 for trunk/src

Timestamp:

Feb 7, 2018, 7:48:52 PM (7 years ago)

Author:

sommeria

Message:

updated for Matlab 2016

Location:

trunk/src

Files:

• series.m (modified) (9 diffs)
• series/merge_proj.m (modified) (2 diffs)
• uigetfile_uvmat.m (modified) (2 diffs)

trunk/src/series.m

@@ -217 +217 @@
     end
     %get the menu of actions
-%     if isfield(h,'ActionExtListUser') && iscell(h.ActionExtListUser)
-%         ActionExtList=[ActionExtList; h.ActionExtListUser];
-%     end 
     if isfield(h,'ActionListUser') && iscell(h.ActionListUser) && isfield(h,'ActionPathListUser') && iscell(h.ActionPathListUser)
         ActionList=[ActionList;h.ActionListUser];
@@ -287 +284 @@
     end
 end
-% if isfield(Param,'Coord_x_str') && ischar(Param.Coord_x_str)
-%         set(handles.Coord_x,'String',Param.Coord_x_str); % list menu fields
-% end
-% if isfield(Param,'Coord_y_str')&& ischar(Param.Coord_y_str)
-%         set(handles.Coord_y,'String',Param.Coord_y_str); % list menu fields
-% end
 
 %% introduce the input file name(s) if defined from input Param,
@@ -1557 +1548 @@
                 cd(get(handles.ActionPath,'String'))% go to the directory of Action
                 addpath(path_uvmat)% add the path to uvmat to run the fct 'compile'
-                addpath(fullfile(path_uvmat,'transform_field'))% add the path to uvmat to run the fct 'compile'
+                addpath(fullfile(path_uvmat,'transform_field'))% add the path to transform functions to run the fct 'compile'
                 compile(ActionName,TransformPath)
                 cd(currentdir)
@@ -2326 +2317 @@
 FieldList_1=get(handles.FieldName_1,'String'); % previous list as default
 if ~iscell(FieldList_1),FieldList_1={FieldList_1};end
-%CheckList=0; % indicate whether FieldName has been updated
 CheckList_1=1; % indicate whether FieldName_1 has been updated
 handles_coord=[handles.Coord_x handles.Coord_y handles.Coord_z handles.Coord_x_title handles.Coord_y_title handles.Coord_z_title];
@@ -2335 +2325 @@
     set(handles.VelType,'Visible','on')
     set(handles.VelType_title,'Visible','on')
-    FieldList=[set_field_list('U','V');{'C'};{'get_field...'}]; % standard menu for civx data
+    FieldList=set_field_list('U','V'); % standard menu for civx data
     %CheckList=1;
     set(handles.FieldName,'Value',1); % velocity vector choice by default
@@ -2388 +2378 @@
     
     set(handles_coord,'Visible','on')
-    FieldList=[FieldList;{'get_field...'}];
+    if isempty(find(strcmp('get_field...',FieldList)))
+    FieldList=[FieldList;{'get_field...'}];%add 'get_field...' to the menu FieldName if it is not already
+    end
     if FieldNameRequest_1 && numel(iview_netcdf)>=2
         set(handles.FieldName_1,'Visible','on')
@@ -2693 +2685 @@
                     ['norm(' UName ',' VName ')'];...
                     UName;VName};
+                set(handles.VelType,'Visible','off')
             case {'scalar'}
                 FieldList=GetFieldData.PanelScalar.scalar;
@@ -2699 +2692 @@
                     FieldList={FieldList};
                 end
+                set(handles.VelType,'Visible','off')
             case 'civdata...'
                 FieldList=[set_field_list('U','V') ;{'C'}];
@@ -2704 +2698 @@
                 XName='X';
                 YName='y';
+                set(handles.VelType,'Visible','on')
         end
         set(handles.FieldName,'Value',1)

trunk/src/series/merge_proj.m

@@ -143 +143 @@
     [FileInfo{iview},MovieObject{iview}]=get_file_info(filecell{iview,1});
     FileType{iview}=FileInfo{iview}.FileType;
+    if strcmp(FileType{iview},'civdata')&&  ~isfield(Param.InputFields,'VelType')
+        FileType{iview}='netcdf';
+    end
     CheckImage{iview}=~isempty(find(strcmp(FileType{iview},ImageTypeOptions)));% =1 for images
     if CheckImage{iview}
@@ -313 +316 @@
         
         %% calculate tps coefficients if needed
-        check_proj_tps= isfield(Param,'ProjObject')&&~isempty(Param.ProjObject)&& strcmp(Param.ProjObject.ProjMode,'interp_tps')&&~isfield(Data{iview},'Coord_tps');
+
+        check_proj_tps= strcmp(FileType{iview},'civdata') && isfield(Param,'ProjObject')&&~isempty(Param.ProjObject)...
+            && strcmp(Param.ProjObject.ProjMode,'interp_tps')&&~isfield(Data{iview},'Coord_tps');
         Data{iview}=tps_coeff_field(Data{iview},check_proj_tps);
         

trunk/src/uigetfile_uvmat.m

@@ -192 +192 @@
 end
 set(hObject,'backgroundColor',[0 1 0])% indicate end button activation
-uiresume(get(hObject,'parent'))
+fig_struct=get(hObject,'parent');
+uiresume(fig_struct.Number)
 
 %------------------------------------------------------------------------
@@ -334 +335 @@
 ListCells=struct2cell(ListStruct);% transform dir struct to a cell arrray
 ListFiles=ListCells(1,:);%list of file names
-check_dir=cell2mat(ListCells(4,:));% =1 for directories, =0 for files
+index_dir=find(strcmp('isdir',fieldnames(ListStruct)));
+check_dir=cell2mat(ListCells(index_dir,:));% =1 for directories, =0 for files
 % for ilist=1:numel(check_dir)
 %     if check_dir(ilist)