Ignore:
Timestamp:
Mar 5, 2010, 11:23:19 PM (15 years ago)
Author:
sommeria
Message:

-get_field: functions called by ACTION in the GUI get_field put in the subdirectory get_field (like for series)
-help put in the subdir uvmat_doc, help call in uvmat, civ, geometry calib modified accordingly

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/geometry_calib.m

    r17 r36  
    146146
    147147%case of calibration (ImaDoc) input file
    148 hcalib=get(handles.calib_type,'parent');
    149 CalibData=get(hcalib,'UserData');
     148% hcalib=get(handles.calib_type,'parent');
     149CalibData=get(handles.figure1,'UserData');
    150150CalibData.XmlInput=fileinput;
    151151if isfield(s,'Heading')
    … …  
    153153end
    154154
    155 set(hcalib,'UserData',CalibData);%store the heading in the interface 'UserData'
     155set(handles.figure1,'UserData',CalibData);%store the heading in the interface 'UserData'
    156156if isfield(s,'GeometryCalib')
    157157    Calib=s.GeometryCalib;
    … …  
    412412end
    413413if testinput
    414     outcome=dataview(XmlInput,SubCampaignTest,GeometryCalib)
     414    outcome=dataview(XmlInput,SubCampaignTest,GeometryCalib);
    415415end
    416416%     %A COMPLETER
    … …  
    10141014path_to_uvmat=which ('uvmat');% check the path of uvmat
    10151015pathelp=fileparts(path_to_uvmat);
    1016     helpfile=fullfile(pathelp,'UVMAT_DOC','uvmat_doc.html');
    1017 if isempty(dir(helpfile)), warndlg_uvmat('The help file uvmat_doc.html needs to be put in the directory UVMAT/UVMAT_DOC','ERROR')
     1016    helpfile=fullfile(pathelp,'uvmat_doc','uvmat_doc.html');
     1017if isempty(dir(helpfile)), msgbox_uvmat('ERROR','Please put the help file uvmat_doc.html in the sub-directory /uvmat_doc of the UVMAT package')
    10181018else
     1019   addpath (fullfile(pathelp,'uvmat_doc'))
    10191020   web([helpfile '#geometry_calib'])
    10201021end
    … …  
    10231024function MenuCreateGrid_Callback(hObject, eventdata, handles)
    10241025%------------------------------------------------------------------------
    1025 hcalib=get(handles.calib_type,'parent');%handles of the GUI geometry_calib
    1026 CalibData=get(hcalib,'UserData');
     1026%hcalib=get(handles.calib_type,'parent');%handles of the GUI geometry_calib
     1027CalibData=get(handles.figure1,'UserData');
    10271028Tinput=[];%default
    10281029if isfield(CalibData,'grid')
    10291030    Tinput=CalibData.grid;
    10301031end
    1031 T=create_grid(Tinput)%display the GUI create_grid
     1032T=create_grid(Tinput);%display the GUI create_grid
    10321033CalibData.grid=T;
    1033 set(hcalib,'UserData',CalibData)
     1034set(handles.figure1,'UserData',CalibData)
    10341035
    10351036%grid in phys space
    10361037Coord_cell=get(handles.ListCoord,'String');
    1037 data=read_geometry_calib(Coord_cell)
     1038data=read_geometry_calib(Coord_cell);
    10381039nbpoints=size(data.Coord,1); %nbre of calibration points
    1039 data.Coord(1:size(T,1),1:3)=T;
     1040data.Coord(1:size(T,1),1:3)=T;%update the existing list of phys coordinates from the GUI create_grid
    10401041for i=1:nbpoints
    10411042   for j=1:5
    … …  
    10611062function MenuTranslatePoints_Callback(hObject, eventdata, handles)
    10621063%-----------------------------------------------------------------------
    1063 hcalib=get(handles.calib_type,'parent');%handles of the GUI geometry_calib
    1064 CalibData=get(hcalib,'UserData')
     1064%hcalib=get(handles.calib_type,'parent');%handles of the GUI geometry_calib
     1065CalibData=get(handles.figure1,'UserData');
    10651066Tinput=[];%default
    10661067if isfield(CalibData,'translate')
    … …  
    10691070T=translate_points(Tinput);%display translate_points GUI and get shift parameters
    10701071CalibData.translate=T;
    1071 set(hcalib,'UserData',CalibData)
     1072set(handles.figure1,'UserData',CalibData)
    10721073%translation
    10731074Coord_cell=get(handles.ListCoord,'String');
    … …  
    10891090% --------------------------------------------------------------------
    10901091function MenuRotatePoints_Callback(hObject, eventdata, handles)
    1091 hcalib=get(handles.calib_type,'parent');%handles of the GUI geometry_calib
    1092 CalibData=get(hcalib,'UserData')
     1092%hcalib=get(handles.calib_type,'parent');%handles of the GUI geometry_calib
     1093CalibData=get(handles.figure1,'UserData');
    10931094Tinput=[];%default
    10941095if isfield(CalibData,'rotate')
    … …  
    10971098T=rotate_points(Tinput);%display translate_points GUI and get shift parameters
    10981099CalibData.rotate=T;
    1099 set(hcalib,'UserData',CalibData)
     1100set(handles.figure1,'UserData',CalibData)
    11001101%-----------------------------------------------------
    11011102%rotation
Note: See TracChangeset for help on using the changeset viewer.