Ignore:
Timestamp:
Jul 23, 2012, 8:44:33 PM (9 years ago)
Author:
sommeria
Message:

various bug corrections, compatibilty with older PIV data

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/geometry_calib.m

    r494 r498  
    113113    set(handles.ListCoord,'String',{'......'})
    114114    if exist(inputfile,'file')
    115         Heading=loadfile(handles,inputfile);% load the point coordinates existing in the xml file
     115        Heading=loadfile(handles,inputfile);% load data from the xml file
    116116        if isfield(Heading,'Campaign')&& ischar(Heading.Campaign)
    117117            struct.Campaign=Heading.Campaign;
     
    274274        GeometryCalib.RefractionIndex=str2double(answer{4});     
    275275    end
     276    UserData=get(handles.geometry_calib,'UserData');
     277    if isfield(UserData,'XmlInputFile')&&~strcmp(UserData.XmlInputFile, outputfile)&&~exist(outputfile,'file')
     278     [success,message]=copyfile(UserData.XmlInputFile,outputfile);%copy the old xml file to a new one with the new convention
     279    end
    276280    errormsg=update_imadoc(GeometryCalib,outputfile);% introduce the calibration data in the xml file
    277281    if ~strcmp(errormsg,'')
     
    290294    set(hhuvmat.CheckFixLimits,'Value',0)% put FixedLimits option to 'off'
    291295    set(hhuvmat.CheckFixLimits,'BackgroundColor',[0.7 0.7 0.7])
    292     UserData=get(handles.geometry_calib,'UserData');
     296   
    293297    UserData.XmlInputFile=outputfile;%save the current xml file name
    294298    set(handles.geometry_calib,'UserData',UserData)
     
    13701374GeometryCalib=s.GeometryCalib;
    13711375fx=1;fy=1;Cx=0;Cy=0;kc=0; %default
    1372 %     Tabchar={};
    13731376CoordCell={};
    1374 %     kc=0;%default
    1375 %     f1=1000;
    1376 %     f2=1000;
    1377 %     hhuvmat=guidata(findobj(allchild(0),'Name','uvmat'));
    1378 %     Cx=str2num(get(hhuvmat.num_Npx,'String'))/2;
    1379 %     Cy=str2num(get(hhuvmat.num_Npy,'String'))/2;
    13801377Tabchar={};%default
    13811378val_cal=1;%default
Note: See TracChangeset for help on using the changeset viewer.