Changeset 156 for trunk/src/geometry_calib.m

Timestamp:

Dec 19, 2010, 10:11:04 PM (14 years ago)

Author:

sommeria

Message:

many bug repairs and corrections for mouse action
create_grid: option for black marjkers for grid detection

File:

• trunk/src/geometry_calib.m (modified) (6 diffs)

trunk/src/geometry_calib.m

@@ -75 +75 @@
 %------------------------------------------------------------------------
 % Choose default command line output for geometry_calib
+
 handles.output = hObject;
 
@@ -82 +83 @@
 
 %set the position of the interface
-if exist('pos','var')&& length(pos)>2
-    pos_gui=get(hObject,'Position');
-    pos_gui(1)=pos(1);
-    pos_gui(2)=pos(2);
-    set(hObject,'Position',pos_gui);
+if exist('pos','var')&& length(pos)>=4
+%     %pos_gui=get(hObject,'Position');
+%     pos_gui(1)=pos(1);
+%     pos_gui(2)=pos(2);
+    set(hObject,'Position',pos);
 end
 
 %set menu of calibration options
-%set(handles.calib_type,'String',{'rescale';'linear';'perspective';'normal';'tsai';'bouguet';'extrinsic'})
 set(handles.calib_type,'String',{'rescale';'linear';'3D_linear';'3D_quadr';'3D_extrinsic'})
 inputxml='';
@@ -99 +99 @@
         inputfile=[fullfile(Pathsub,RootFile) '.xml'];%xml file corresponding to the input file
     end
-end
-set(handles.ListCoord,'String',{'......'})
-if exist(inputfile,'file')
-    Heading=loadfile(handles,inputfile);% load the point coordiantes existing in the xml file
-end
-if isfield(Heading,'Campaign')&& ischar(Heading.Campaign)
-    struct.Campaign=Heading.Campaign;
-end
-set(hObject,'UserData',struct)
+    set(handles.ListCoord,'String',{'......'})
+    if exist(inputfile,'file')
+        Heading=loadfile(handles,inputfile);% load the point coordiantes existing in the xml file
+        if isfield(Heading,'Campaign')&& ischar(Heading.Campaign)
+            struct.Campaign=Heading.Campaign;
+        end
+    end   
+    set(hObject,'UserData',struct)
+end
+
 set(handles.ListCoord,'KeyPressFcn',{@key_press_fcn,handles})%set keyboard action function
 
@@ -126 +127 @@
 if ~isempty(huvmat)
     handles=guidata(huvmat);
-    set(handles.MenuMask,'enable','on')
-    set(handles.MenuGrid,'enable','on')
-    set(handles.MenuObject,'enable','on')
-    set(handles.MenuEdit,'enable','on')
-    set(handles.edit,'enable','on')
+%     set(handles.MenuMask,'enable','on')
+%     set(handles.MenuGrid,'enable','on')
+%     set(handles.MenuObject,'enable','on')
+%     set(handles.MenuEdit,'enable','on')
+%     set(handles.edit,'enable','on')
     hobject=findobj(handles.axes3,'tag','calib_points');
     if ~isempty(hobject)
@@ -1103 +1104 @@
     grid_input=CalibData.grid;%retrieve the previously used grid
 end
-[T,CalibData.grid]=create_grid(grid_input,'detect_grid');%display the GUI create_grid, read the set of phys coordinates T
+[T,CalibData.grid,white_test]=create_grid(grid_input,'detect_grid');%display the GUI create_grid, read the set of phys coordinates T
 
 set(handles.geometry_calib,'UserData',CalibData)%store the phys grid parameters for later use
@@ -1200 +1201 @@
 % [Amod,Rangx,Rangy]=phys_Ima(A-min(min(A)),GeometryCalib,0);
 
-
-Amod=double(Amod);
+if white_test
+    Amod=double(Amod);%will look for image maxima
+else
+    Amod=-double(Amod);%will look for image minima
+end
 % figure(12) %display corrected image
 % Amax=max(max(Amod));