Changeset 1030
- Timestamp:
- Feb 7, 2018, 7:48:52 PM (7 years ago)
- Location:
- trunk/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/series.m
r1027 r1030 217 217 end 218 218 %get the menu of actions 219 % if isfield(h,'ActionExtListUser') && iscell(h.ActionExtListUser)220 % ActionExtList=[ActionExtList; h.ActionExtListUser];221 % end222 219 if isfield(h,'ActionListUser') && iscell(h.ActionListUser) && isfield(h,'ActionPathListUser') && iscell(h.ActionPathListUser) 223 220 ActionList=[ActionList;h.ActionListUser]; … … 287 284 end 288 285 end 289 % if isfield(Param,'Coord_x_str') && ischar(Param.Coord_x_str)290 % set(handles.Coord_x,'String',Param.Coord_x_str); % list menu fields291 % end292 % if isfield(Param,'Coord_y_str')&& ischar(Param.Coord_y_str)293 % set(handles.Coord_y,'String',Param.Coord_y_str); % list menu fields294 % end295 286 296 287 %% introduce the input file name(s) if defined from input Param, … … 1557 1548 cd(get(handles.ActionPath,'String'))% go to the directory of Action 1558 1549 addpath(path_uvmat)% add the path to uvmat to run the fct 'compile' 1559 addpath(fullfile(path_uvmat,'transform_field'))% add the path to uvmatto run the fct 'compile'1550 addpath(fullfile(path_uvmat,'transform_field'))% add the path to transform functions to run the fct 'compile' 1560 1551 compile(ActionName,TransformPath) 1561 1552 cd(currentdir) … … 2326 2317 FieldList_1=get(handles.FieldName_1,'String'); % previous list as default 2327 2318 if ~iscell(FieldList_1),FieldList_1={FieldList_1};end 2328 %CheckList=0; % indicate whether FieldName has been updated2329 2319 CheckList_1=1; % indicate whether FieldName_1 has been updated 2330 2320 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') 2336 2326 set(handles.VelType_title,'Visible','on') 2337 FieldList= [set_field_list('U','V');{'C'};{'get_field...'}]; % standard menu for civx data2327 FieldList=set_field_list('U','V'); % standard menu for civx data 2338 2328 %CheckList=1; 2339 2329 set(handles.FieldName,'Value',1); % velocity vector choice by default … … 2388 2378 2389 2379 set(handles_coord,'Visible','on') 2390 FieldList=[FieldList;{'get_field...'}]; 2380 if isempty(find(strcmp('get_field...',FieldList))) 2381 FieldList=[FieldList;{'get_field...'}];%add 'get_field...' to the menu FieldName if it is not already 2382 end 2391 2383 if FieldNameRequest_1 && numel(iview_netcdf)>=2 2392 2384 set(handles.FieldName_1,'Visible','on') … … 2693 2685 ['norm(' UName ',' VName ')'];... 2694 2686 UName;VName}; 2687 set(handles.VelType,'Visible','off') 2695 2688 case {'scalar'} 2696 2689 FieldList=GetFieldData.PanelScalar.scalar; … … 2699 2692 FieldList={FieldList}; 2700 2693 end 2694 set(handles.VelType,'Visible','off') 2701 2695 case 'civdata...' 2702 2696 FieldList=[set_field_list('U','V') ;{'C'}]; … … 2704 2698 XName='X'; 2705 2699 YName='y'; 2700 set(handles.VelType,'Visible','on') 2706 2701 end 2707 2702 set(handles.FieldName,'Value',1) -
trunk/src/series/merge_proj.m
r1027 r1030 143 143 [FileInfo{iview},MovieObject{iview}]=get_file_info(filecell{iview,1}); 144 144 FileType{iview}=FileInfo{iview}.FileType; 145 if strcmp(FileType{iview},'civdata')&& ~isfield(Param.InputFields,'VelType') 146 FileType{iview}='netcdf'; 147 end 145 148 CheckImage{iview}=~isempty(find(strcmp(FileType{iview},ImageTypeOptions)));% =1 for images 146 149 if CheckImage{iview} … … 313 316 314 317 %% calculate tps coefficients if needed 315 check_proj_tps= isfield(Param,'ProjObject')&&~isempty(Param.ProjObject)&& strcmp(Param.ProjObject.ProjMode,'interp_tps')&&~isfield(Data{iview},'Coord_tps'); 318 319 check_proj_tps= strcmp(FileType{iview},'civdata') && isfield(Param,'ProjObject')&&~isempty(Param.ProjObject)... 320 && strcmp(Param.ProjObject.ProjMode,'interp_tps')&&~isfield(Data{iview},'Coord_tps'); 316 321 Data{iview}=tps_coeff_field(Data{iview},check_proj_tps); 317 322 -
trunk/src/uigetfile_uvmat.m
r1027 r1030 192 192 end 193 193 set(hObject,'backgroundColor',[0 1 0])% indicate end button activation 194 uiresume(get(hObject,'parent')) 194 fig_struct=get(hObject,'parent'); 195 uiresume(fig_struct.Number) 195 196 196 197 %------------------------------------------------------------------------ … … 334 335 ListCells=struct2cell(ListStruct);% transform dir struct to a cell arrray 335 336 ListFiles=ListCells(1,:);%list of file names 336 check_dir=cell2mat(ListCells(4,:));% =1 for directories, =0 for files 337 index_dir=find(strcmp('isdir',fieldnames(ListStruct))); 338 check_dir=cell2mat(ListCells(index_dir,:));% =1 for directories, =0 for files 337 339 % for ilist=1:numel(check_dir) 338 340 % if check_dir(ilist)
Note: See TracChangeset
for help on using the changeset viewer.