Changeset 881 for trunk/src/series/civ_input.m
- Timestamp:
- Mar 6, 2015, 9:10:16 PM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/series/civ_input.m
r880 r881 332 332 %% list the possible index pairs, depending on the option set in ListPairMode 333 333 ListPairMode_Callback([], [], handles) 334 ListPairCiv1_Callback(hObject, eventdata, handles)334 %ListPairCiv1_Callback(hObject, eventdata, handles) 335 335 336 336 %% set the GUI to modal: wait for OK to close … … 875 875 end 876 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}; 877 menu_pair=get(handles.ListPairCiv1,'String');%previous menu of ListPairCiv1 878 PairCiv1Init=menu_pair{get(handles.ListPairCiv1,'Value')};%previous choice of pair 879 menu_pair=get(handles.ListPairCiv2,'String');%previous menu of ListPairCiv1 880 PairCiv2Init=menu_pair{get(handles.ListPairCiv2,'Value')};%previous choice of pair 880 881 881 882 %% determine nom_type_nc, nomenclature type of the .nc files: … … 973 974 974 975 %% determine the default selection in the pair menu for Civ1 975 ichoice=find(select,1);% index of first selected pair976 if (isempty(ichoice) || ichoice < 1); ichoice=1; end;977 ichoice=find(strcmp( init_choice,displ_pair'),1);976 %ichoice=find(select,1);% index of first selected pair 977 %if (isempty(ichoice) || ichoice < 1); ichoice=1; end; 978 ichoice=find(strcmp(PairCiv1Init,displ_pair'),1); 978 979 if ~isempty(ichoice) 979 980 set(handles.ListPairCiv1,'Value',ichoice);% first valid pair proposed by default in the menu … … 987 988 %% determine the default selection in the pair menu for Civ2 988 989 if strcmp(get(handles.ListPairCiv2,'Visible'),'on') 989 initial=get(handles.ListPairCiv2,'Value'); 990 if initial>length(displ_pair')%|~isequal(select(initial),1) 991 if ichoice <= length(displ_pair') 992 set(handles.ListPairCiv2,'Value',ichoice);% same pair proposed by default for civ2 993 else 994 set(handles.ListPairCiv2,'Value',1);% same pair proposed by default for civ2 995 end 996 end 990 ichoice=find(strcmp(PairCiv2Init,displ_pair'),1); 991 if ~isempty(ichoice) 992 set(handles.ListPairCiv2,'Value',ichoice);% first valid pair proposed by default in the menu 993 else 994 set(handles.ListPairCiv2,'Value',1) 995 end 996 997 % 998 % initial=get(handles.ListPairCiv2,'Value'); 999 % 1000 % 1001 % if initial>length(displ_pair')%|~isequal(select(initial),1) 1002 % if ichoice <= length(displ_pair') 1003 % set(handles.ListPairCiv2,'Value',ichoice);% same pair proposed by default for civ2 1004 % else 1005 % set(handles.ListPairCiv2,'Value',1);% same pair proposed by default for civ2 1006 % end 1007 % end 997 1008 else 998 1009 set(handles.ListPairCiv2,'Value',get(handles.ListPairCiv1,'Value'))% initiate the choice of Civ2 as a reproduction of if civ1
Note: See TracChangeset
for help on using the changeset viewer.