Changeset 1112 for trunk/src/set_grid.m

Timestamp:

Jan 26, 2022, 7:37:21 PM (2 years ago)

Author:

sommeria

Message:

set_slice separated from geometrey_calib

File:

• trunk/src/set_grid.m (modified) (6 diffs)

trunk/src/set_grid.m

@@ -258 +258 @@
     end
     tsaiA=[];%default
+    SliceA=[];
     if exist(fileAxml,'file')
         [XmlDataA,errormsg]=imadoc2struct(fileAxml);
@@ -266 +267 @@
         if isfield(XmlDataA,'GeometryCalib')
             tsaiA=XmlDataA.GeometryCalib;
+            SliceA=tsaiA;%default
+        end
+        if isfield(XmlDataA,'Slice')
+            SliceA=XmlDataA.Slice;
         end
     end
@@ -271 +276 @@
         msgbox_uvmat('WARNING','no geometric calibration available for image A, phys =pixel')
     else
-        [grid_x_imaA,grid_y_imaA]=px_XYZ(tsaiA,grid_x,grid_y,GUI.Z);
+        [grid_x_imaA,grid_y_imaA]=px_XYZ(tsaiA,SliceA,grid_x,grid_y,GUI.Z);
     end
 end
@@ -293 +298 @@
     end
     tsaiB=[];%default
+    SliceB=[];
     if exist(fileBxml,'file')
         [XmlDataB,errormsg]=imadoc2struct(fileBxml);
@@ -301 +307 @@
         if isfield(XmlDataB,'GeometryCalib')
             tsaiB=XmlDataB.GeometryCalib;
+            SliceB=tsaiB;%default
+        end
+        if isfield(XmlDataB,'Slice')
+            SliceB=XmlDataB.Slice;
         end
     end
@@ -308 +318 @@
         grid_y_imaB=grid_y;
     else
-        [grid_x_imaB,grid_y_imaB]=px_XYZ(tsaiB,grid_x,grid_y,GUI.Z);
+        [grid_x_imaB,grid_y_imaB]=px_XYZ(tsaiB,SliceB,grid_x,grid_y,GUI.Z);
     end
     B=imread(GUI.ImageB);