Changeset 36 for trunk/src/civ.m

Timestamp:

Mar 5, 2010, 11:23:19 PM (14 years ago)

Author:

sommeria

Message:

-get_field: functions called by ACTION in the GUI get_field put in the subdirectory get_field (like for series)
-help put in the subdir uvmat_doc, help call in uvmat, civ, geometry calib modified accordingly

File:

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

trunk/src/civ.m

@@ -1315 +1315 @@
     find_pair_indices(handles,mode)
 %------------------------------------------------------------------------
-first_i=str2num(get(handles.first_i,'String'));
-last_i=str2num(get(handles.last_i,'String'));
-incr=str2num(get(handles.incr_i,'String'));
-num1=[first_i:incr:last_i];
+first_i=str2num(get(handles.first_i,'String'));%first index i 
+last_i=str2num(get(handles.last_i,'String'));%last index i 
+incr=str2num(get(handles.incr_i,'String'));% increment
+num1=[first_i:incr:last_i];% list of i indices (reference values for each pair)
 if isequal(get(handles.first_j,'Visible'),'on')
-    first_j=str2num(get(handles.first_j,'String'));
-    last_j=str2num(get(handles.last_j,'String'));
-    incr_j=str2num(get(handles.incr_j,'String'));
+    first_j=str2num(get(handles.first_j,'String'));%first index j
+    last_j=str2num(get(handles.last_j,'String'));%last index j 
+    incr_j=str2num(get(handles.incr_j,'String'));% increment
 else
     first_j=1;
@@ -1328 +1328 @@
     incr_j=1;
 end
-num_j=[first_j:incr_j:last_j];
+num_j=[first_j:incr_j:last_j];% list of j indices (reference values for each pair)
 list_civ1=get(handles.list_pair_civ1,'String');
 index_civ1=get(handles.list_pair_civ1,'Value');
-str_civ1=list_civ1{index_civ1};
+str_civ1=list_civ1{index_civ1};%string defining the image pairs for civ1
 if isempty(str_civ1)||isequal(str_civ1,'')
     msgbox_uvmat('ERROR','no image pair selected for civ1')
@@ -1342 +1342 @@
     index_civ2=index_civ1;
 end
-str_civ2=list_civ2{index_civ2};
-if isequal(first_i,[])|isequal(first_j,[]), errordlg('first field number not defined'),...
-    set(handles.RUN, 'Enable','On'), set(handles.RUN,'BackgroundColor',[1 0 0]),return,end;
-if isequal(last_i,[])| isequal(last_j,[]),errordlg('last field number not defined'),...
-    set(handles.RUN, 'Enable','On'), set(handles.RUN,'BackgroundColor',[1 0 0]),return,end;
-if isequal(incr,[])| isequal(incr_j,[]),errordlg('increment in field number not defined'),...
-    set(handles.RUN, 'Enable','On'), set(handles.RUN,'BackgroundColor',[1 0 0]),return,end;
-if last_i < first_i | last_j < first_j , errordlg('last field number must be larger than the first one'),...
-    set(handles.RUN, 'Enable','On'), set(handles.RUN,'BackgroundColor',[1 0 0]),return,end;
-if isequal (mode,'series(Di)')% |isequal(mode,'st_series(Di)')    
+str_civ2=list_civ2{index_civ2};%string defining the image pairs for civ2
+if isempty(first_i)||isempty(first_j), msgbox_uvmat('ERROR','first field number not defined'),...
+    return,end;
+if isequal(last_i,[])| isequal(last_j,[]),msgbox_uvmat('ERROR','last field number not defined'),...
+    return,end;
+if isequal(incr,[])| isequal(incr_j,[]),msgbox_uvmat('ERROR','increment in field number not defined'),...
+    return,end;
+if last_i < first_i | last_j < first_j , msgbox_uvmat('ERROR','last field number must be larger than the first one'),...
+    return,end;
+if isequal (mode,'series(Di)') 
      %recognize the pair civ1 from the display
         indsel=find((double(str_civ1)<48)|(double(str_civ1)>57));% character indices of non numerical characters
@@ -1408 +1408 @@
         num2_civ2=num2_civ2(indsel);
     end
-elseif isequal (mode,'series(Dj)')%|isequal (mode,'st_series(Dj)')
+elseif isequal (mode,'series(Dj)')
     lastfield_j=str2num(get(handles.nb_field2,'String'));
     num1_civ1=num1;% set of first image numbers
@@ -1435 +1435 @@
         num_b_civ2=num_b_civ2(indsel);
     end
-elseif isequal(mode,'pair j1-j2')% | isequal(mode,'st_pair j1-j2') %case of bursts (png_old or png_2D)
+elseif isequal(mode,'pair j1-j2') %case of bursts (png_old or png_2D)
     num1_civ1=num1;
     num1_civ2=num1;
@@ -1455 +1455 @@
     num_b_civ2=num_j;
 end
+'TESTfind'
+num1_civ1
+num2_civ1
+num_a_civ1
+num_b_civ1
 
 %------------------------------------------------------------------------
@@ -1659 +1664 @@
 [filecell,num1_civ1,num2_civ1,num_a_civ1,num_b_civ1,num1_civ2,num2_civ2,num_a_civ2,num_b_civ2,nom_type_nc,file_ref_fix1,file_ref_fix2]=...
        set_civ_filenames(handles,compare,box_test);
+   'TESTnbre_RUN'
+nbfield=size(num1_civ1,2)
+nbslice=size(num1_civ1,1)
+
 if isempty(filecell)
    set(handles.RUN, 'Enable','On')
@@ -2176 +2185 @@
        set_civ_filenames(handles,compare,box_test);
 display('files OK, processing...')  
-nbfield=size(num1_civ1,2);
-nbslice=size(num1_civ1,1);
+'TESTnbre'
+nbfield=size(num1_civ1,2)
+nbslice=size(num1_civ1,1)
 
 %GET PARAMETERS:
@@ -3504 +3514 @@
                 textout=char(textcmx);
 %               dlmwrite(filename_cmx,textout,'');
-        
-        filename_ima
-        filename_ima_1
      fid=fopen([filename_cmx],'w');
 fprintf(fid, ['##############   CMX file' '\n']);
@@ -4956 +4963 @@
 path_to_uvmat=which ('uvmat');% check the path of uvmat
 pathelp=fileparts(path_to_uvmat);
-helpfile=fullfile(pathelp,'UVMAT_DOC','uvmat_doc.html');
-if isempty(dir(helpfile)), errordlg('Please put the help file uvmat_doc.html in the directory UVMAT/UVMAT_DOC')
-else
-web([helpfile '#civ'])    
+helpfile=fullfile(pathelp,'uvmat_doc','uvmat_doc.html');
+if isempty(dir(helpfile)), msgbox_uvmat('ERROR','Please put the help file uvmat_doc.html in the sub-directory /uvmat_doc of the UVMAT package')
+else
+    addpath (fullfile(pathelp,'uvmat_doc'))
+    web([helpfile '#civ'])    
 end