Changeset 116 for trunk/src/uvmat.m

Timestamp:

Oct 16, 2010, 5:56:00 PM (14 years ago)

Author:

sommeria

Message:

geometry_calib is now updated when a new image is viewed by uvmat
imadoc2struct corrected for time reading

File:

• trunk/src/uvmat.m (modified) (2 diffs)

trunk/src/uvmat.m

@@ -744 +744 @@
     set(handles.view_xml,'BackgroundColor',[1 1 1])
     drawnow
+    if isfield(XmlData, 'GeometryCalib') && ~isempty(XmlData.GeometryCalib)
+        hgeometry_calib=findobj('tag','geometry_calib');
+        if ~isempty(hgeometry_calib)
+            GUserData=get(hgeometry_calib,'UserData');
+            if ~(isfield(GUserData,'XmlInputFile') && strcmp(GUserData.XmlInputFile,filexml))
+                answer=msgbox_uvmat('INPUT_Y-N','replace the display of geometry_calib with the new input data?');
+                if strcmp(answer,'Yes')
+                    geometry_calib(filexml);%diplay the new calibration points and parameters in geometry_calib
+                end
+            end
+        end
+    end  
 elseif exist(fileciv,'file')% if .civ file found 
     [error,XmlData.Time,TimeUnit,mode,npx,npy,pxcmx,pxcmy]=read_imatext([FileBase '.civ']);
@@ -4565 +4577 @@
 pos(2)=pos(2)-0.02;
 [FileName,RootPath,FileBase,FileIndices,FileExt,SubDir]=read_file_boxes(handles);
-[UvData.hset_object,UvData.sethandles]=geometry_calib(handles,pos,FileName);% call the set_object interface     
+[UvData.hset_object,UvData.sethandles]=geometry_calib(FileName,pos);% call the geometry_calib interface 
 pos_uvmat=get(handles.uvmat,'Position');