Changeset 1030 for trunk/src


Ignore:
Timestamp:
Feb 7, 2018, 7:48:52 PM (3 years ago)
Author:
sommeria
Message:

updated for Matlab 2016

Location:
trunk/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/series.m

    r1027 r1030  
    217217    end
    218218    %get the menu of actions
    219 %     if isfield(h,'ActionExtListUser') && iscell(h.ActionExtListUser)
    220 %         ActionExtList=[ActionExtList; h.ActionExtListUser];
    221 %     end
    222219    if isfield(h,'ActionListUser') && iscell(h.ActionListUser) && isfield(h,'ActionPathListUser') && iscell(h.ActionPathListUser)
    223220        ActionList=[ActionList;h.ActionListUser];
     
    287284    end
    288285end
    289 % if isfield(Param,'Coord_x_str') && ischar(Param.Coord_x_str)
    290 %         set(handles.Coord_x,'String',Param.Coord_x_str); % list menu fields
    291 % end
    292 % if isfield(Param,'Coord_y_str')&& ischar(Param.Coord_y_str)
    293 %         set(handles.Coord_y,'String',Param.Coord_y_str); % list menu fields
    294 % end
    295286
    296287%% introduce the input file name(s) if defined from input Param,
     
    15571548                cd(get(handles.ActionPath,'String'))% go to the directory of Action
    15581549                addpath(path_uvmat)% add the path to uvmat to run the fct 'compile'
    1559                 addpath(fullfile(path_uvmat,'transform_field'))% add the path to uvmat to run the fct 'compile'
     1550                addpath(fullfile(path_uvmat,'transform_field'))% add the path to transform functions to run the fct 'compile'
    15601551                compile(ActionName,TransformPath)
    15611552                cd(currentdir)
     
    23262317FieldList_1=get(handles.FieldName_1,'String'); % previous list as default
    23272318if ~iscell(FieldList_1),FieldList_1={FieldList_1};end
    2328 %CheckList=0; % indicate whether FieldName has been updated
    23292319CheckList_1=1; % indicate whether FieldName_1 has been updated
    23302320handles_coord=[handles.Coord_x handles.Coord_y handles.Coord_z handles.Coord_x_title handles.Coord_y_title handles.Coord_z_title];
     
    23352325    set(handles.VelType,'Visible','on')
    23362326    set(handles.VelType_title,'Visible','on')
    2337     FieldList=[set_field_list('U','V');{'C'};{'get_field...'}]; % standard menu for civx data
     2327    FieldList=set_field_list('U','V'); % standard menu for civx data
    23382328    %CheckList=1;
    23392329    set(handles.FieldName,'Value',1); % velocity vector choice by default
     
    23882378   
    23892379    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
    23912383    if FieldNameRequest_1 && numel(iview_netcdf)>=2
    23922384        set(handles.FieldName_1,'Visible','on')
     
    26932685                    ['norm(' UName ',' VName ')'];...
    26942686                    UName;VName};
     2687                set(handles.VelType,'Visible','off')
    26952688            case {'scalar'}
    26962689                FieldList=GetFieldData.PanelScalar.scalar;
     
    26992692                    FieldList={FieldList};
    27002693                end
     2694                set(handles.VelType,'Visible','off')
    27012695            case 'civdata...'
    27022696                FieldList=[set_field_list('U','V') ;{'C'}];
     
    27042698                XName='X';
    27052699                YName='y';
     2700                set(handles.VelType,'Visible','on')
    27062701        end
    27072702        set(handles.FieldName,'Value',1)
  • trunk/src/series/merge_proj.m

    r1027 r1030  
    143143    [FileInfo{iview},MovieObject{iview}]=get_file_info(filecell{iview,1});
    144144    FileType{iview}=FileInfo{iview}.FileType;
     145    if strcmp(FileType{iview},'civdata')&&  ~isfield(Param.InputFields,'VelType')
     146        FileType{iview}='netcdf';
     147    end
    145148    CheckImage{iview}=~isempty(find(strcmp(FileType{iview},ImageTypeOptions)));% =1 for images
    146149    if CheckImage{iview}
     
    313316       
    314317        %% 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');
    316321        Data{iview}=tps_coeff_field(Data{iview},check_proj_tps);
    317322       
  • trunk/src/uigetfile_uvmat.m

    r1027 r1030  
    192192end
    193193set(hObject,'backgroundColor',[0 1 0])% indicate end button activation
    194 uiresume(get(hObject,'parent'))
     194fig_struct=get(hObject,'parent');
     195uiresume(fig_struct.Number)
    195196
    196197%------------------------------------------------------------------------
     
    334335ListCells=struct2cell(ListStruct);% transform dir struct to a cell arrray
    335336ListFiles=ListCells(1,:);%list of file names
    336 check_dir=cell2mat(ListCells(4,:));% =1 for directories, =0 for files
     337index_dir=find(strcmp('isdir',fieldnames(ListStruct)));
     338check_dir=cell2mat(ListCells(index_dir,:));% =1 for directories, =0 for files
    337339% for ilist=1:numel(check_dir)
    338340%     if check_dir(ilist)
Note: See TracChangeset for help on using the changeset viewer.