Ignore:
Timestamp:
Mar 4, 2011, 12:07:38 AM (10 years ago)
Author:
sommeria
Message:

bug corrected for 3D geometry calib: tilt angles

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/geometry_calib.m

    r207 r213  
    242242if strcmp(answer,'Yes')
    243243    if strcmp(calib_cell{val}(1:2),'3D')%set the plane position for 3D (projection) calibration
    244        input_key={'Z (first position)','Z (last position)','Z (water surface)', 'refractive index','NbSlice','volume scan (y/n)','tilt angle'};
    245        input_val=[{num2str(ZEnd)} {num2str(ZStart)} {num2str(ZStart)} {'1.33'} num2str(NbSlice_j) {volume_scan} {'0'}];
    246         answer=inputdlg(input_key,'slice position(s)',ones(1,7), input_val,'on');
     244       input_key={'Z (first position)','Z (last position)','Z (water surface)', 'refractive index','NbSlice','volume scan (y/n)','tilt angle y axis','tilt angle x axis'};
     245       input_val=[{num2str(ZEnd)} {num2str(ZStart)} {num2str(ZStart)} {'1.333'} num2str(NbSlice_j) {volume_scan} {'0'} {'0'}];
     246        answer=inputdlg(input_key,'slice position(s)',ones(1,8), input_val,'on');
    247247        %answer_1=msgbox_uvmat('INPUT_TXT',' Z= ',num2str(Z_plane));
    248248        GeometryCalib.NbSlice=str2double(answer{5});
     
    254254        end     
    255255        GeometryCalib.SliceCoord=Z_plane'*[0 0 1];
    256         GeometryCalib.SliceAngle=answer{7}*ones(GeometryCalib.NbSlice,1)*[0 1 0];%rotation around y axis (to generalise)
     256        GeometryCalib.SliceAngle(:,3)=0;
     257        GeometryCalib.SliceAngle(:,2)=str2double(answer{7})*ones(GeometryCalib.NbSlice,1);%rotation around y axis (to generalise)
     258        GeometryCalib.SliceAngle(:,1)=str2double(answer{8})*ones(GeometryCalib.NbSlice,1);%rotation around x axis (to generalise)
    257259        GeometryCalib.InterfaceCoord=[0 0 str2double(answer{3})];
    258260        GeometryCalib.RefractionIndex=str2double(answer{4});     
Note: See TracChangeset for help on using the changeset viewer.