Changeset 1008 for trunk/src


Ignore:
Timestamp:
Jul 13, 2017, 3:49:43 PM (4 years ago)
Author:
campagne8a
Message:

Calib.f1 to Calib.fx

Location:
trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/geometry_calib.m

    r1006 r1008  
    206206Intrinsic.Npy=str2num(get(hhuvmat.num_Npy,'String'));
    207207Intrinsic.coord_files=get(handles.ListCoordFiles,'String');
    208 Intrinsic.f1=str2num(get(handles.fx,'String'));
    209 Intrinsic.f2=str2num(get(handles.fy,'String'));
    210 Intrinsic.k=str2num(get(handles.kc,'String'));
     208Intrinsic.fx=str2num(get(handles.fx,'String'));
     209Intrinsic.fy=str2num(get(handles.fy,'String'));
     210Intrinsic.kc=str2num(get(handles.kc,'String'));
    211211Intrinsic.Cx=str2num(get(handles.Cx,'String'));
    212212Intrinsic.Cy=str2num(get(handles.Cy,'String'));
    213 if isempty(Intrinsic.k)
    214     Intrinsic.k=0;
     213if isempty(Intrinsic.kc)
     214    Intrinsic.kc=0;
    215215end
    216216if isempty(Intrinsic.Cx)||isempty(Intrinsic.Cy)
     
    307307Intrinsic.Npy=str2num(get(hhuvmat.num_Npy,'String'));
    308308Intrinsic.coord_files=get(handles.ListCoordFiles,'String');
    309 Intrinsic.f1=str2num(get(handles.fx,'String'));
    310 Intrinsic.f2=str2num(get(handles.fy,'String'));
    311 Intrinsic.k=str2num(get(handles.kc,'String'));
     309Intrinsic.fx=str2num(get(handles.fx,'String'));
     310Intrinsic.fy=str2num(get(handles.fy,'String'));
     311Intrinsic.kc=str2num(get(handles.kc,'String'));
    312312Intrinsic.Cx=str2num(get(handles.Cx,'String'));
    313313Intrinsic.Cy=str2num(get(handles.Cy,'String'));
    314 if isempty(Intrinsic.k)
    315     Intrinsic.k=0;
     314if isempty(Intrinsic.kc)
     315    Intrinsic.kc=0;
    316316end
    317317if isempty(Intrinsic.Cx)||isempty(Intrinsic.Cy)
     
    486486function GeometryCalib=calib_normal(Coord,Intrinsic)
    487487%------------------------------------------------------------------------
    488 Calib.f1=str2num(get(handles.fx,'String'));
    489 Calib.f2=str2num(get(handles.fy,'String'));
    490 Calib.k=str2num(get(handles.kc,'String'));
     488Calib.fx=str2num(get(handles.fx,'String'));
     489Calib.fy=str2num(get(handles.fy,'String'));
     490Calib.kc=str2num(get(handles.kc,'String'));
    491491Calib.Cx=str2num(get(handles.Cx,'String'));
    492492Calib.Cy=str2num(get(handles.Cy,'String'));
    493493%default
    494 if isempty(Calib.f1)
    495     Calib.f1=25/0.012;
    496 end
    497 if isempty(Calib.f2)
    498     Calib.f2=25/0.012;
    499 end
    500 if isempty(Calib.k)
    501     Calib.k=0;
     494if isempty(Calib.fx)
     495    Calib.fx=25/0.012;
     496end
     497if isempty(Calib.fy)
     498    Calib.fy=25/0.012;
     499end
     500if isempty(Calib.kc)
     501    Calib.kc=0;
    502502end
    503503if isempty(Calib.Cx)||isempty(Calib.Cy)
     
    510510Calib.dpx=0.012;%arbitrary
    511511Calib.dpy=0.012;
    512 Calib.sx=Calib.f1*Calib.dpx/(Calib.f2*Calib.dpy);
    513 Calib.f=Calib.f2*Calib.dpy;
    514 Calib.kappa1=Calib.k/(Calib.f*Calib.f);
     512Calib.sx=Calib.fx*Calib.dpx/(Calib.fy*Calib.dpy);
     513Calib.f=Calib.fy*Calib.dpy;
     514Calib.kappa1=Calib.kc/(Calib.f*Calib.f);
    515515
    516516%initial guess
     
    693693
    694694%------------------------------------------------------------------------
    695 function GeometryCalib=calib_3D_extrinsic(Coord,Intrinsic)
     695function GeometryCalib=calib_3D_extrinsic(Coord, Intrinsic)
    696696%------------------------------------------------------------------
    697697path_uvmat=which('geometry_calib');% check the path detected for source file uvmat
     
    709709n_ima=1;
    710710GeometryCalib.CalibrationType='3D_extrinsic';
    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'));
     711fx=Intrinsic.fx;
     712fy=Intrinsic.fy;
     713Cx=Intrinsic.Cx;
     714Cy=Intrinsic.Cy;
     715kc=Intrinsic.kc;
    715716errormsg='';
    716717if isempty(fx)
     
    728729    return
    729730end
    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'));
     731GeometryCalib.fx_fy(1)=fx;
     732GeometryCalib.fx_fy(2)=fy;
     733GeometryCalib.Cx_Cy(1)=Cx;
     734GeometryCalib.Cx_Cy(2)=Cy;
     735GeometryCalib.kc=kc;
    735736fct_path=fullfile(path_UVMAT,'toolbox_calib');
    736737addpath(fct_path)
  • trunk/src/series.m

    r1005 r1008  
    24892489%% Check whether alphabetical sorting of input Subdir is allowed by the Action fct  (for multiples series entries)
    24902490if isfield(ParamOut,'AllowInputSort')&&isequal(ParamOut.AllowInputSort,'on')&& size(Param.InputTable,1)>1
    2491     [tild,iview]=sort(InputTable(:,2)); % subdirectories sorted in alphabetical order
    2492     set(handles.InputTable,'Data',InputTable(iview,:));
     2491    [tild,iview]=sort(Param.InputTable(:,2)); % subdirectories sorted in alphabetical order
     2492    set(handles.InputTable,'Data',Param.InputTable(iview,:));
    24932493    MinIndex_i=get(handles.MinIndex_i,'Data');
    24942494    MinIndex_j=get(handles.MinIndex_j,'Data');
Note: See TracChangeset for help on using the changeset viewer.