Commit 84e61b79 authored by Andrey Filippov's avatar Andrey Filippov
Browse files

implementing rig adjustment

parent c5b6a7a7

src/main/java/AlignmentCorrection.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -731,6 +731,7 @@ public class AlignmentCorrection { 
			double centerY = tileY * qc.tp.getTileSize() + qc.tp.getTileSize()/2;//- shiftY;

			double centerY = tileY * qc.tp.getTileSize() + qc.tp.getTileSize()/2;//- shiftY;





			double [][] centersXY_disp = qc.geometryCorrection.getPortsCoordinatesAndDerivatives(

			double [][] centersXY_disp = qc.geometryCorrection.getPortsCoordinatesAndDerivatives(

					qc.geometryCorrection, //			GeometryCorrection gc_main,

					false,          // boolean use_rig_offsets,

					false,          // boolean use_rig_offsets,

					corr_rots, // Matrix []   rots,

					corr_rots, // Matrix []   rots,

					null,      //  Matrix [][] deriv_rots,

					null,      //  Matrix [][] deriv_rots,
@@ -739,6 +740,7 @@ public class AlignmentCorrection { 
					centerY,

					centerY,

					disp_strength[2 * s.series + 0][s.tile]/magic_coeff); // disparity

					disp_strength[2 * s.series + 0][s.tile]/magic_coeff); // disparity

			double [][] centersXY_inf = qc.geometryCorrection.getPortsCoordinatesAndDerivatives(

			double [][] centersXY_inf = qc.geometryCorrection.getPortsCoordinatesAndDerivatives(

					qc.geometryCorrection, //			GeometryCorrection gc_main,

					false,          // boolean use_rig_offsets,

					false,          // boolean use_rig_offsets,

					corr_rots, // Matrix []   rots,

					corr_rots, // Matrix []   rots,

					null,      //  Matrix [][] deriv_rots,

					null,      //  Matrix [][] deriv_rots,
@@ -2436,6 +2438,7 @@ System.out.println("test1234"); 
			double [][] deriv = new double [2 * NUM_SENSORS][];

			double [][] deriv = new double [2 * NUM_SENSORS][];

			int dbg_index =dbg_index (pXY, dbg_decimate);

			int dbg_index =dbg_index (pXY, dbg_decimate);

			geometryCorrection.getPortsCoordinatesAndDerivatives(

			geometryCorrection.getPortsCoordinatesAndDerivatives(

					geometryCorrection, //			GeometryCorrection gc_main,

					false,          // boolean use_rig_offsets,

					false,          // boolean use_rig_offsets,

					corr_rots,   //  Matrix []   rots,

					corr_rots,   //  Matrix []   rots,

					deriv_rots,  //  Matrix [][] deriv_rots,

					deriv_rots,  //  Matrix [][] deriv_rots,
@@ -2600,6 +2603,7 @@ System.out.println("test1234"); 
			Mismatch mm = mismatch_list.get(indx);

			Mismatch mm = mismatch_list.get(indx);

			double [] pXY = mm.getPXY();

			double [] pXY = mm.getPXY();

			double [][] f = geometryCorrection.getPortsCoordinatesAndDerivatives( // 4x2

			double [][] f = geometryCorrection.getPortsCoordinatesAndDerivatives( // 4x2

					geometryCorrection, //			GeometryCorrection gc_main,

					false,          // boolean use_rig_offsets,

					false,          // boolean use_rig_offsets,

					corr_rots,    //  Matrix []   rots,

					corr_rots,    //  Matrix []   rots,

					null, //  Matrix [][] deriv_rots,

					null, //  Matrix [][] deriv_rots,

src/main/java/BiQuadParameters.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -61,7 +61,7 @@ public class BiQuadParameters { 
	public boolean rig_adjust_angle =          true;   //

	public boolean rig_adjust_angle =          true;   //

	public boolean rig_adjust_distance =       false;  // distance between camera centers

	public boolean rig_adjust_distance =       false;  // distance between camera centers

	public boolean rig_adjust_forward =        false;  // aux camera forward from the principal plane (not implemented)

	public boolean rig_adjust_forward =        false;  // aux camera forward from the principal plane (not implemented)

	public double  rig_correction_scale=       1.0;    // scale calcualated correction

	public double  rig_correction_scale=       1.0;    // scale calculaated correction