Changeset 180 for trunk/src/civ.m

Timestamp:

Jan 18, 2011, 10:50:40 PM (13 years ago)

Author:

sommeria

Message:

rationalisation of uvmat, introduction of the new function read_field, links with get_field, several bug repairs

File:

• trunk/src/civ.m (modified) (3 diffs)

trunk/src/civ.m

@@ -1598 +1598 @@
 box_test(5)=get(handles.FIX2,'Value');
 box_test(6)=get(handles.PATCH2,'Value');
-index=find(box_test==1);
-if isempty(index)
+index_first=find(box_test==1,1);
+if isempty(index_first)
     msgbox_uvmat('ERROR','no selected operation')
     return
 end
-index_first=min(index);
-index_last=max(index);
+index_last=find(box_test==1,1,'last');
 box_used=box_test(index_first : index_last);
 [box_missing,ind_missing]=min(box_used);
-if isequal(box_missing,0)
+if isequal(box_missing,0); %there is a missing step in the sequence of operations
     msgbox_uvmat('ERROR',['missing' cell2mat(operations(ind_missing))]);
     return
@@ -1640 +1639 @@
 %% reinitialise status callback 
 if isfield(handles,'status')
-set(handles.status,'Value',0);%suppress status display
-status_Callback(hObject, eventdata, handles)
+    set(handles.status,'Value',0);%suppress status display
+    status_Callback(hObject, eventdata, handles)
 end
 
 %% set the list of files and check them
 display('checking the files...')
-%compare=get(handles.compare,'Value');%test for usual PIV (compare=1) or displacement (=2) or stereo PIV (=3)
 [filecell,num1_civ1,num2_civ1,num_a_civ1,num_b_civ1,num1_civ2,num2_civ2,num_a_civ2,num_b_civ2,nom_type_nc]=...
     set_civ_filenames(handles,box_test);
@@ -4623 +4621 @@
 box_test(4)=get(handles.CIV2,'Value');
 box_test(5)=get(handles.FIX2,'Value');
-box_test(6)=get(handles.PATCH2,'Value')
-find(box_test)
-option_civ=max(find(box_test))
+box_test(6)=get(handles.PATCH2,'Value');
+option_civ=find(box_test,1,'last');%last selected option (non-zero index of box_test)
 filecell=get(handles.civ,'UserData');
 if ~isfield(filecell,'nc')