Changeset 862 for trunk/src/series/civ2vel_3C.m

Timestamp:

Jan 30, 2015, 8:37:03 PM (9 years ago)

Author:

sommeria

Message:

bugs repaired

File:

• trunk/src/series/civ2vel_3C.m (modified) (4 diffs)

trunk/src/series/civ2vel_3C.m

@@ -1 @@
-%'civ2vel_3C': combine velocity fields from two camerasto get three velocity components
+%'civ2vel_3C': combine velocity fields from two cameras to get three velocity components
 %------------------------------------------------------------------------
 % function ParamOut=civ2vel_3C(Param)
@@ -116 +116 @@
      tsaiA=XmlData{1}.GeometryCalib;
  else
-     msgbox_uvmat('ERROR','no geometric calibration available for image A')
+     disp_uvmat('ERROR','no geometric calibration available for image A',checkrun)
      return
  end
@@ -122 +122 @@
      tsaiB=XmlData{2}.GeometryCalib;
  else
-     msgbox_uvmat('ERROR','no geometric calibration available for image B')
+     disp_uvmat('ERROR','no geometric calibration available for image B',checkrun)
      return
  end
 [filecell,i1_series,i2_series,j1_series,j2_series]=get_file_series(Param);
 
-%% grid of physical positions
+%% grid of physical positions (given by projection plane)
+if ~Param.CheckObject
+         disp_uvmat('ERROR','a projection plane with interpolation is needed',checkrun)
+     return
+end
+ObjectData=Param.ProjObject;
+
 [x,y]=meshgrid(ObjectData.RangeX(1):ObjectData.DX:ObjectData.RangeX(2),ObjectData.RangeY(1):ObjectData.DY:ObjectData.RangeY(2));
+z=zeros(size(x));
+[Field,ParamOut,errormsg] = read_field(FileName,FileType,ParamIn,num)
 %camera coordinates:initialisation 2 cameras
 NbCamera=2;
@@ -178 +186 @@
         %% transform the input field (e.g; phys) if requested (no transform involving two input fields)
             %camera 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);
-        zc=R(7)*Xphys+R(8)*Yphys+R(9)*Zphys+Calib.Tx_Ty_Tz(3);
-
-        %undistorted image coordinates
-        Xu=xc./zc;
-        Yu=yc./zc;
         Data{iview}=phys(Data{iview},XmlData{iview});