Changeset 1006 for trunk


Ignore:
Timestamp:
Apr 7, 2017, 4:16:13 PM (4 years ago)
Author:
campagne8a
Message:

Bug corrected for geometry_calibration

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/geometry_calib.m

    r1001 r1006  
    592592est_fc=[1;1];
    593593center_optim=0;
     594path_uvmat=which('uvmat');% check the path detected for source file uvmat
     595path_UVMAT=fileparts(path_uvmat); %path to UVMAT
    594596run(fullfile(path_UVMAT,'toolbox_calib','go_calib_optim'));% apply fct 'toolbox_calib/go_calib_optim'
    595597if exist('Rc_1','var')
     
    613615
    614616%------------------------------------------------------------------------
    615 function GeometryCalib=calib_3D_quadr(Coord,handles)
     617function GeometryCalib=calib_3D_quadr(Coord,Intrinsic)
    616618%------------------------------------------------------------------
    617619
     
    625627end
    626628% check_cond=0;
    627 coord_files=get(handles.ListCoordFiles,'String');
     629
     630coord_files=Intrinsic.coord_files;
     631
    628632if ischar(coord_files)
    629633    coord_files={coord_files};
     
    689693
    690694%------------------------------------------------------------------------
    691 function GeometryCalib=calib_3D_extrinsic(Coord,handles)
     695function GeometryCalib=calib_3D_extrinsic(Coord,Intrinsic)
    692696%------------------------------------------------------------------
    693697path_uvmat=which('geometry_calib');% check the path detected for source file uvmat
     
    705709n_ima=1;
    706710GeometryCalib.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'));
     711fx=str2num(get(Intrinsic.fx,'String'));
     712fy=str2num(get(Intrinsic.fy,'String'));
     713Cx=str2num(get(Intrinsic.Cx,'String'));
     714Cy=str2num(get(Intrinsic.Cy,'String'));
    711715errormsg='';
    712716if isempty(fx)
     
    724728    return
    725729end
    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'));
     730GeometryCalib.fx_fy(1)=str2num(get(Intrinsic.fx,'String'));
     731GeometryCalib.fx_fy(2)=str2num(get(Intrinsic.fy,'String'));
     732GeometryCalib.Cx_Cy(1)=str2num(get(Intrinsic.Cx,'String'));
     733GeometryCalib.Cx_Cy(2)=str2num(get(Intrinsic.Cy,'String'));
     734GeometryCalib.kc=str2num(get(Intrinsic.kc,'String'));
    731735fct_path=fullfile(path_UVMAT,'toolbox_calib');
    732736addpath(fct_path)
Note: See TracChangeset for help on using the changeset viewer.