Changeset 498 for trunk/src/geometry_calib.m

Timestamp:

Jul 23, 2012, 8:44:33 PM (12 years ago)

Author:

sommeria

Message:

various bug corrections, compatibilty with older PIV data

File:

• trunk/src/geometry_calib.m (modified) (4 diffs)

trunk/src/geometry_calib.m

@@ -113 +113 @@
     set(handles.ListCoord,'String',{'......'})
     if exist(inputfile,'file')
-        Heading=loadfile(handles,inputfile);% load the point coordinates existing in the xml file
+        Heading=loadfile(handles,inputfile);% load data from the xml file
         if isfield(Heading,'Campaign')&& ischar(Heading.Campaign)
             struct.Campaign=Heading.Campaign;
@@ -274 +274 @@
         GeometryCalib.RefractionIndex=str2double(answer{4});     
     end
+    UserData=get(handles.geometry_calib,'UserData');
+    if isfield(UserData,'XmlInputFile')&&~strcmp(UserData.XmlInputFile, outputfile)&&~exist(outputfile,'file')
+     [success,message]=copyfile(UserData.XmlInputFile,outputfile);%copy the old xml file to a new one with the new convention 
+    end
     errormsg=update_imadoc(GeometryCalib,outputfile);% introduce the calibration data in the xml file
     if ~strcmp(errormsg,'')
@@ -290 +294 @@
     set(hhuvmat.CheckFixLimits,'Value',0)% put FixedLimits option to 'off'
     set(hhuvmat.CheckFixLimits,'BackgroundColor',[0.7 0.7 0.7])
-    UserData=get(handles.geometry_calib,'UserData');
+    
     UserData.XmlInputFile=outputfile;%save the current xml file name
     set(handles.geometry_calib,'UserData',UserData)
@@ -1370 +1374 @@
 GeometryCalib=s.GeometryCalib;
 fx=1;fy=1;Cx=0;Cy=0;kc=0; %default
-%     Tabchar={};
 CoordCell={};
-%     kc=0;%default
-%     f1=1000;
-%     f2=1000;
-%     hhuvmat=guidata(findobj(allchild(0),'Name','uvmat'));
-%     Cx=str2num(get(hhuvmat.num_Npx,'String'))/2;
-%     Cy=str2num(get(hhuvmat.num_Npy,'String'))/2;
 Tabchar={};%default
 val_cal=1;%default