Changeset 880 for trunk/src/series/civ_input.m

Timestamp:

Mar 4, 2015, 12:01:38 AM (9 years ago)

Author:

sommeria

Message:

various bug fixes

File:

• trunk/src/series/civ_input.m (modified) (7 diffs)

trunk/src/series/civ_input.m

@@ -83 +83 @@
     set(handles.CheckThreshold,'Visible','on')
     set(handles.CheckDeformation,'Value',0)% desactivate (work in progress)
-    %set(handles.CheckDecimal,'Value',0)% desactivate (work in progress)
 end
 switch Param.Action.ActionName
@@ -288 +287 @@
     if isequal(get(hhseries.REFRESH,'BackgroundColor'),[1 1 0]) &&...
             ~(isfield(Param,'ActionInput') && isfield(Param.ActionInput,'ConfigSource')) 
-%         answer=msgbox_uvmat('INPUT_Y-N',['import the civ parameters from the netcdf file']);
-%         if strcmp(answer,'Yes')
             for index = 1:min(ind_opening,5)
                 set(handles.(ListOptions{index}),'value',0)
@@ -300 +297 @@
             end
             checkrefresh=1;
-%         end
     end
     if ind_opening>=3
@@ -696 +692 @@
 % in mode 'pair j1-j2', j1 and j2 are the file indices, else the indices
 % are relative to the reference indices ref_i and ref_j respectively.
-if isequal(mode,'pair j1-j2')%| isequal(mode,'st_pair j1-j2')
+if isequal(mode,'pair j1-j2')
     dt=1;
     displ='';
@@ -869 +865 @@
 val=get(handles.ListCompareMode,'Value');
 compare=compare_list{val};
-if strcmp(compare,'displacement')||strcmp(compare,'shift')
-    mode='displacement';
-else
+if ~strcmp(compare,'displacement')%||strcmp(compare,'shift')
+ 
     mode_list=get(handles.ListPairMode,'String');
     mode_value=get(handles.ListPairMode,'Value');
@@ -880 +875 @@
 end
 nom_type_ima=CivInputData.NomTypeIma;
+initial=get(handles.ListPairCiv1,'Value');%previous choice of pair
+menu_pair=get(handles.ListPairCiv1,'String');%previous choice of pair.ListPairCiv1
+init_choice=menu_pair{initial};
 
 %% determine nom_type_nc, nomenclature type of the .nc files:
@@ -977 +975 @@
 ichoice=find(select,1);% index of first selected pair
 if (isempty(ichoice) || ichoice < 1); ichoice=1; end;
-initial=get(handles.ListPairCiv1,'Value');%initial choice of pair
-if initial>nbpair || (numel(select)>=initial && ~isequal(select(initial),1))
+ichoice=find(strcmp(init_choice,displ_pair'),1);
+if ~isempty(ichoice)
     set(handles.ListPairCiv1,'Value',ichoice);% first valid pair proposed by default in the menu
-end
+else
+   set(handles.ListPairCiv1,'Value',1) 
+end
+% if initial>nbpair || (numel(select)>=initial && ~isequal(select(initial),1))
+%     set(handles.ListPairCiv1,'Value',ichoice);% first valid pair proposed by default in the menu
+% end
 
 %% determine the default selection in the pair menu for Civ2