Ignore:
Timestamp:
Dec 13, 2011, 11:20:07 AM (9 years ago)
Author:
sommeria
Message:

NomType? changed from _i1-i2 ... to _1-2 ... (bugs to be expected!)
bug corrected in geometry_calib
series changed by introducing a from FileIndices?, introduction of find_file_series to detect the file series corresponding to an input file

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/geometry_calib.m

    r252 r332  
    275275        delete(hhh);
    276276    end
    277     set(hhuvmat.FixLimits,'Value',0)% put FixedLimits option to 'off'
    278     set(hhuvmat.FixLimits,'BackgroundColor',[0.7 0.7 0.7])
     277    set(hhuvmat.CheckFixLimits,'Value',0)% put FixedLimits option to 'off'
     278    set(hhuvmat.CheckFixLimits,'BackgroundColor',[0.7 0.7 0.7])
    279279    UserData=get(handles.geometry_calib,'UserData');
    280280    UserData.XmlInputFile=outputfile;%save the current xml file name
     
    499499    huvmat=findobj(allchild(0),'Tag','uvmat');
    500500    hhuvmat=guidata(huvmat);
    501     Calib.Cx=str2num(get(hhuvmat.npx,'String'))/2;
    502     Calib.Cx=str2num(get(hhuvmat.npy,'String'))/2;
     501    Calib.Cx=str2num(get(hhuvmat.num_Npx,'String'))/2;
     502    Calib.Cx=str2num(get(hhuvmat.num_Npy,'String'))/2;
    503503end   
    504504%tsai parameters
     
    557557%retrieve the calibration points stored in the files listed in the popup list coord_files
    558558x_1=Coord(:,4:5)';%px coordinates of the ref points
    559 nx=str2num(get(hhuvmat.npx,'String'));
    560 ny=str2num(get(hhuvmat.npy,'String'));
     559nx=str2num(get(hhuvmat.num_Npx,'String'));
     560ny=str2num(get(hhuvmat.num_Npy,'String'));
    561561x_1(2,:)=ny-x_1(2,:);%reverse the y image coordinates
    562562X_1=Coord(:,1:3)';%phys coordinates of the ref points
     
    629629%retrieve the calibration points stored in the files listed in the popup list coord_files
    630630x_1=Coord(:,4:5)';%px coordinates of the ref points
    631 nx=str2num(get(hhuvmat.npx,'String'));
    632 ny=str2num(get(hhuvmat.npy,'String'));
     631nx=str2num(get(hhuvmat.num_Npx,'String'));
     632ny=str2num(get(hhuvmat.num_Npy,'String'));
    633633x_1(2,:)=ny-x_1(2,:);%reverse the y image coordinates
    634634X_1=Coord(:,1:3)';%phys coordinates of the ref points
     
    693693huvmat=findobj(allchild(0),'Tag','uvmat');
    694694hhuvmat=guidata(huvmat);
    695 ny=str2double(get(hhuvmat.npy,'String'));
     695ny=str2double(get(hhuvmat.num_Npy,'String'));
    696696x_1(2,:)=ny-x_1(2,:);%reverse the y image coordinates
    697697n_ima=1;
     
    15961596%     f2=1000;
    15971597%     hhuvmat=guidata(findobj(allchild(0),'Name','uvmat'));
    1598 %     Cx=str2num(get(hhuvmat.npx,'String'))/2;
    1599 %     Cy=str2num(get(hhuvmat.npy,'String'))/2;
     1598%     Cx=str2num(get(hhuvmat.num_Npx,'String'))/2;
     1599%     Cy=str2num(get(hhuvmat.num_Npy,'String'))/2;
    16001600Tabchar={};%default
    16011601val_cal=1;%default
Note: See TracChangeset for help on using the changeset viewer.