Changeset 541


Ignore:
Timestamp:
Sep 14, 2012, 9:06:04 AM (9 years ago)
Author:
sommeria
Message:

bugs corrected in geometry_calib and zoom management in uvmat

Location:
trunk/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/geometry_calib.m

    r517 r541  
    139139if ~isempty(huvmat)
    140140    handles=guidata(huvmat);
    141     hobject=findobj(handles.axes3,'tag','calib_points');
     141    hobject=findobj(handles.PlotAxes,'tag','calib_points');
    142142    if ~isempty(hobject)
    143143        delete(hobject)
    144144    end
    145     hobject=findobj(handles.axes3,'tag','calib_marker');
     145    hobject=findobj(handles.PlotAxes,'tag','calib_marker');
    146146    if ~isempty(hobject)
    147147        delete(hobject)
     
    287287   
    288288    %display image with new calibration in the currently opened uvmat interface
    289     hhh=findobj(hhuvmat.axes3,'Tag','calib_marker');% delete calib points and markers
     289    hhh=findobj(hhuvmat.PlotAxes,'Tag','calib_marker');% delete calib points and markers
    290290    if ~isempty(hhh)
    291291        delete(hhh);     
    292292    end
    293     hhh=findobj(hhuvmat.axes3,'Tag','calib_points');
     293    hhh=findobj(hhuvmat.PlotAxes,'Tag','calib_points');
    294294    if ~isempty(hhh)
    295295        delete(hhh);
     
    998998    end
    999999end
    1000 %axes(hhuvmat.axes3)
     1000
    10011001set(0,'CurrentFigure',huvmat)
    10021002set(huvmat,'CurrentAxes',hhuvmat.PlotAxes)
  • trunk/src/mouse_down.m

    r534 r541  
    377377end
    378378
    379 %% create calibration points if the GUI geometry_calib is opened, if the main axes axes3 of uvmat has ben selected
    380 if ~test_zoom && test_cal && ~isempty(haxes) && strcmp(get(haxes,'tag'),'axes3')
     379%% create calibration points if the GUI geometry_calib is opened, if the main axes PlotAxes of uvmat has ben selected
     380if ~test_zoom && test_cal && ~isempty(haxes) && strcmp(get(haxes,'tag'),'PlotAxes')
    381381    h_geometry_calib=findobj(allchild(0),'Name','geometry_calib'); %find the geomterty_calib GUI
    382382    hh_geometry_calib=guidata(h_geometry_calib);
  • trunk/src/uvmat.m

    r540 r541  
    13551355        choice_value=get(handles.transform_fct,'Value');
    13561356        transform_name=menu_transform{choice_value};%name of the transform fct  given by the menu 'transform_fct'
    1357         transform_list=get(handles.transform_fct,'UserData');
    1358         transform=transform_list{choice_value};
     1357%         transform_list=get(handles.transform_fct,'UserData');
     1358%         transform=transform_list{choice_value};
     1359        transform=get(handles.path_transform,'UserData');
    13591360        if  ~isequal(transform_name,'') && ~isequal(transform_name,'px')
    13601361            if isfield(UvData,'XmlData') && isfield(UvData.XmlData{1},'GeometryCalib')%use geometry calib recorded from the ImaDoc xml file as first priority
     
    35583559end
    35593560
    3560 set(handles.CheckFixLimits,'Value',0)
    3561 set(handles.CheckFixLimits,'BackgroundColor',[0.7 0.7 0.7])
    35623561
    35633562%% delete drawn objects if the output CooordUnit is different from the previous one
    35643563if ~strcmp(CoordUnit,CoordUnitPrev)
     3564    set(handles.CheckFixLimits,'Value',0)
     3565set(handles.CheckFixLimits,'BackgroundColor',[0.7 0.7 0.7])
    35653566    hother=findobj('Tag','proj_object');%find all the proj objects
    35663567    for iobj=1:length(hother)
Note: See TracChangeset for help on using the changeset viewer.