Changeset 1201 for trunk/src/px_XYZ.m

Timestamp:

Mar 23, 2026, 4:49:29 PM (3 hours ago)

Author:

sommeria

Message:

various improvements...

File:

• trunk/src/px_XYZ.m (modified) (5 diffs)

trunk/src/px_XYZ.m

@@ -1 @@
-%'px_XYZ': transform physical to image coordinates. 
+%'px_XYZ': transforms physical to image coordinates. 
 %------------------------------------------------------------------------
-%[X,Y]=px_XYZ(Calib,Xphys,Yphys,Zphys)
+%[X,Y]=px_XYZ(Calib,Slice,Xphys,Yphys,Zphys)
 %------------------------------------------------------------------------           
 % OUTPUT:
@@ -8 +8 @@
 % INPUT:
 % Calib: structure containing calibration parameters
+% Slice: structure indicating the plane cut position
 % Xphys,Yphys,Zphys; vectors of physical coordinates for a set of points
 
@@ -41 +42 @@
 %%%%%%%%%%%%%
 if isempty(Slice)
-    Slice=Calib;
+    Slice=Calib;% old convention (< 2022)
 end
 % general case
@@ -51 +52 @@
         if H>Zphys
             Zphys=H-(H-Zphys)/Slice.RefractionIndex; %corrected z (virtual object)Calib
-            
-          %  test_refraction=1;
         end
     end
     
     %camera coordinates
-    Zphys=Zphys;%flip z coordinates
     xc=R(1)*Xphys+R(2)*Yphys+R(3)*Zphys+Calib.Tx_Ty_Tz(1);
     yc=R(4)*Xphys+R(5)*Yphys+R(6)*Zphys+Calib.Tx_Ty_Tz(2);
@@ -69 +67 @@
     if ~isfield(Calib,'kc')
         r2=1; %no quadratic distortion
-    elseif numel(Calib.kc)==1
+    elseif isscalar(Calib.kc)
         r2=1+Calib.kc*(Xu.*Xu+Yu.*Yu);
     else