Changeset 1006 for trunk

Timestamp:

Apr 7, 2017, 4:16:13 PM (8 years ago)

Author:

campagne8a

Message:

Bug corrected for geometry_calibration

File:

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

trunk/src/geometry_calib.m

@@ -592 +592 @@
 est_fc=[1;1];
 center_optim=0;
+path_uvmat=which('uvmat');% check the path detected for source file uvmat
+path_UVMAT=fileparts(path_uvmat); %path to UVMAT
 run(fullfile(path_UVMAT,'toolbox_calib','go_calib_optim'));% apply fct 'toolbox_calib/go_calib_optim'
 if exist('Rc_1','var')
@@ -613 +615 @@
 
 %------------------------------------------------------------------------
-function GeometryCalib=calib_3D_quadr(Coord,handles)
+function GeometryCalib=calib_3D_quadr(Coord,Intrinsic)
 %------------------------------------------------------------------
 
@@ -625 +627 @@
 end
 % check_cond=0;
-coord_files=get(handles.ListCoordFiles,'String');
+
+coord_files=Intrinsic.coord_files;
+
 if ischar(coord_files)
     coord_files={coord_files};
@@ -689 +693 @@
 
 %------------------------------------------------------------------------
-function GeometryCalib=calib_3D_extrinsic(Coord,handles)
+function GeometryCalib=calib_3D_extrinsic(Coord,Intrinsic)
 %------------------------------------------------------------------
 path_uvmat=which('geometry_calib');% check the path detected for source file uvmat
@@ -705 +709 @@
 n_ima=1;
 GeometryCalib.CalibrationType='3D_extrinsic';
-fx=str2num(get(handles.fx,'String'));
-fy=str2num(get(handles.fy,'String'));
-Cx=str2num(get(handles.Cx,'String'));
-Cy=str2num(get(handles.Cy,'String'));
+fx=str2num(get(Intrinsic.fx,'String'));
+fy=str2num(get(Intrinsic.fy,'String'));
+Cx=str2num(get(Intrinsic.Cx,'String'));
+Cy=str2num(get(Intrinsic.Cy,'String'));
 errormsg='';
 if isempty(fx)
@@ -724 +728 @@
     return
 end
-GeometryCalib.fx_fy(1)=str2num(get(handles.fx,'String'));
-GeometryCalib.fx_fy(2)=str2num(get(handles.fy,'String'));
-GeometryCalib.Cx_Cy(1)=str2num(get(handles.Cx,'String'));
-GeometryCalib.Cx_Cy(2)=str2num(get(handles.Cy,'String'));
-GeometryCalib.kc=str2num(get(handles.kc,'String'));
+GeometryCalib.fx_fy(1)=str2num(get(Intrinsic.fx,'String'));
+GeometryCalib.fx_fy(2)=str2num(get(Intrinsic.fy,'String'));
+GeometryCalib.Cx_Cy(1)=str2num(get(Intrinsic.Cx,'String'));
+GeometryCalib.Cx_Cy(2)=str2num(get(Intrinsic.Cy,'String'));
+GeometryCalib.kc=str2num(get(Intrinsic.kc,'String'));
 fct_path=fullfile(path_UVMAT,'toolbox_calib');
 addpath(fct_path)