Changeset 880 for trunk/src/series/civ_input.m
- Timestamp:
- Mar 4, 2015, 12:01:38 AM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/series/civ_input.m
r876 r880 83 83 set(handles.CheckThreshold,'Visible','on') 84 84 set(handles.CheckDeformation,'Value',0)% desactivate (work in progress) 85 %set(handles.CheckDecimal,'Value',0)% desactivate (work in progress)86 85 end 87 86 switch Param.Action.ActionName … … 288 287 if isequal(get(hhseries.REFRESH,'BackgroundColor'),[1 1 0]) &&... 289 288 ~(isfield(Param,'ActionInput') && isfield(Param.ActionInput,'ConfigSource')) 290 % answer=msgbox_uvmat('INPUT_Y-N',['import the civ parameters from the netcdf file']);291 % if strcmp(answer,'Yes')292 289 for index = 1:min(ind_opening,5) 293 290 set(handles.(ListOptions{index}),'value',0) … … 300 297 end 301 298 checkrefresh=1; 302 % end303 299 end 304 300 if ind_opening>=3 … … 696 692 % in mode 'pair j1-j2', j1 and j2 are the file indices, else the indices 697 693 % are relative to the reference indices ref_i and ref_j respectively. 698 if isequal(mode,'pair j1-j2') %| isequal(mode,'st_pair j1-j2')694 if isequal(mode,'pair j1-j2') 699 695 dt=1; 700 696 displ=''; … … 869 865 val=get(handles.ListCompareMode,'Value'); 870 866 compare=compare_list{val}; 871 if strcmp(compare,'displacement')||strcmp(compare,'shift') 872 mode='displacement'; 873 else 867 if ~strcmp(compare,'displacement')%||strcmp(compare,'shift') 868 874 869 mode_list=get(handles.ListPairMode,'String'); 875 870 mode_value=get(handles.ListPairMode,'Value'); … … 880 875 end 881 876 nom_type_ima=CivInputData.NomTypeIma; 877 initial=get(handles.ListPairCiv1,'Value');%previous choice of pair 878 menu_pair=get(handles.ListPairCiv1,'String');%previous choice of pair.ListPairCiv1 879 init_choice=menu_pair{initial}; 882 880 883 881 %% determine nom_type_nc, nomenclature type of the .nc files: … … 977 975 ichoice=find(select,1);% index of first selected pair 978 976 if (isempty(ichoice) || ichoice < 1); ichoice=1; end; 979 i nitial=get(handles.ListPairCiv1,'Value');%initial choice of pair980 if initial>nbpair || (numel(select)>=initial && ~isequal(select(initial),1))977 ichoice=find(strcmp(init_choice,displ_pair'),1); 978 if ~isempty(ichoice) 981 979 set(handles.ListPairCiv1,'Value',ichoice);% first valid pair proposed by default in the menu 982 end 980 else 981 set(handles.ListPairCiv1,'Value',1) 982 end 983 % if initial>nbpair || (numel(select)>=initial && ~isequal(select(initial),1)) 984 % set(handles.ListPairCiv1,'Value',ichoice);% first valid pair proposed by default in the menu 985 % end 983 986 984 987 %% determine the default selection in the pair menu for Civ2
Note: See TracChangeset
for help on using the changeset viewer.