Changeset 771 for trunk/src/series

Timestamp:

May 3, 2014, 5:20:29 PM (10 years ago)

Author:

sommeria

Message:

 

File:

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

trunk/src/series/civ_input.m

@@ -305 +305 @@
     end
 end
+% indicate max and min indices updated from input file series (not stored in Param.ActionInput)
+set(handles.MaxIndex_i,'String',num2str(MaxIndex_i));
+set(handles.MinIndex_i,'String',num2str(MinIndex_i));
+set(handles.MaxIndex_j,'String',num2str(MaxIndex_i));
+set(handles.MinIndex_j,'String',num2str(MinIndex_i));
 
 %% set the GUI to modal: wait for OK to close
@@ -546 +551 @@
 checkbox(6)=get(handles.CheckPatch2,'Value');
 ind_selected=find(checkbox,1);
-% if ~isempty(ind_selected)
-%     RootPath=get(handles.RootPath,'String');
-%     if isempty(RootPath)
-%         msgbox_uvmat('ERROR','Please open an image or PIV .nc file with the upper bar menu Open/Browse...')
-%         return
-%     end
-% end
 set(handles.PairIndices,'Visible','on')
-%set(handles.Civ1_ImageB,'Visible','on')
-%set(handles.TitleSubdirCiv1,'Visible','on')
 if opening==0
     errormsg=find_netcpair_civ(handles,1); % select the available netcdf files
@@ -564 +560 @@
 if max(checkbox(4:6))% case of civ2 pair choice needed
     set(handles.TitlePairCiv2,'Visible','on')
-%    set(handles.TitleSubdirCiv2,'Visible','on')
-%    set(handles.Civ2_ImageA,'Visible','on')
-    %set(handles.ListSubdirCiv2,'Visible','on')
     set(handles.ListPairCiv2,'Visible','on')
     if ~opening
@@ -575 +568 @@
     end
 else
-%    set(handles.TitleSubdirCiv2,'Visible','off')
-%    set(handles.Civ2_ImageA,'Visible','off')
     set(handles.ListPairCiv2,'Visible','off')
 end
@@ -956 +947 @@
 mode_value=get(handles.ListPairMode,'Value');
 mode=mode_list{mode_value};
+errormsg='';
 if isequal(get(handles.CheckCiv1,'Value'),0)|| isequal(mode,'series(Dj)')
     errormsg=find_netcpair_civ(handles,1);% update the menu of pairs depending on the available netcdf files
@@ -963 +955 @@
     errormsg=find_netcpair_civ(handles,2);
 end
-    if ~isempty(errormsg)
+if ~isempty(errormsg)
     msgbox_uvmat('ERROR',errormsg)
-    end
+end
 
 %------------------------------------------------------------------------