Changeset 1006 for trunk/src/geometry_calib.m
- Timestamp:
- Apr 7, 2017, 4:16:13 PM (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/geometry_calib.m
r1001 r1006 592 592 est_fc=[1;1]; 593 593 center_optim=0; 594 path_uvmat=which('uvmat');% check the path detected for source file uvmat 595 path_UVMAT=fileparts(path_uvmat); %path to UVMAT 594 596 run(fullfile(path_UVMAT,'toolbox_calib','go_calib_optim'));% apply fct 'toolbox_calib/go_calib_optim' 595 597 if exist('Rc_1','var') … … 613 615 614 616 %------------------------------------------------------------------------ 615 function GeometryCalib=calib_3D_quadr(Coord, handles)617 function GeometryCalib=calib_3D_quadr(Coord,Intrinsic) 616 618 %------------------------------------------------------------------ 617 619 … … 625 627 end 626 628 % check_cond=0; 627 coord_files=get(handles.ListCoordFiles,'String'); 629 630 coord_files=Intrinsic.coord_files; 631 628 632 if ischar(coord_files) 629 633 coord_files={coord_files}; … … 689 693 690 694 %------------------------------------------------------------------------ 691 function GeometryCalib=calib_3D_extrinsic(Coord, handles)695 function GeometryCalib=calib_3D_extrinsic(Coord,Intrinsic) 692 696 %------------------------------------------------------------------ 693 697 path_uvmat=which('geometry_calib');% check the path detected for source file uvmat … … 705 709 n_ima=1; 706 710 GeometryCalib.CalibrationType='3D_extrinsic'; 707 fx=str2num(get( handles.fx,'String'));708 fy=str2num(get( handles.fy,'String'));709 Cx=str2num(get( handles.Cx,'String'));710 Cy=str2num(get( handles.Cy,'String'));711 fx=str2num(get(Intrinsic.fx,'String')); 712 fy=str2num(get(Intrinsic.fy,'String')); 713 Cx=str2num(get(Intrinsic.Cx,'String')); 714 Cy=str2num(get(Intrinsic.Cy,'String')); 711 715 errormsg=''; 712 716 if isempty(fx) … … 724 728 return 725 729 end 726 GeometryCalib.fx_fy(1)=str2num(get( handles.fx,'String'));727 GeometryCalib.fx_fy(2)=str2num(get( handles.fy,'String'));728 GeometryCalib.Cx_Cy(1)=str2num(get( handles.Cx,'String'));729 GeometryCalib.Cx_Cy(2)=str2num(get( handles.Cy,'String'));730 GeometryCalib.kc=str2num(get( handles.kc,'String'));730 GeometryCalib.fx_fy(1)=str2num(get(Intrinsic.fx,'String')); 731 GeometryCalib.fx_fy(2)=str2num(get(Intrinsic.fy,'String')); 732 GeometryCalib.Cx_Cy(1)=str2num(get(Intrinsic.Cx,'String')); 733 GeometryCalib.Cx_Cy(2)=str2num(get(Intrinsic.Cy,'String')); 734 GeometryCalib.kc=str2num(get(Intrinsic.kc,'String')); 731 735 fct_path=fullfile(path_UVMAT,'toolbox_calib'); 732 736 addpath(fct_path)
Note: See TracChangeset
for help on using the changeset viewer.