added new surface generation, working on resolving 'impossible triangle' conflicts (508ee2cb) · Commits · Elphel / imagej-elphel

src/main/java/EyesisCorrectionParameters.java

+18 −6

src/main/java/QuadCLT.java

+14 −10

Original line number	Original line	Diff line number	Diff line
	@@ -5233,10 +5233,11 @@ public class QuadCLT {
	tp.clt_3d_passes.get(scanIndex), // CLTPass3d scan,		tp.clt_3d_passes.get(scanIndex), // CLTPass3d scan,
	"X3D-"+scanIndex);		"X3D-"+scanIndex);
	}		}
	boolean showTri = ((scanIndex < next_pass + 1) && clt_parameters.show_triangles) \|\|(scanIndex == 49) \|\| (scanIndex == 54);		boolean showTri = ((scanIndex < next_pass + 1) && clt_parameters.show_triangles) \|\|((scanIndex - next_pass) == 73);
	generateClusterX3d(		generateClusterX3d(
	x3dOutput,		x3dOutput,
	texturePath,		texturePath,
			"shape_id-"+(scanIndex - next_pass), // id
	scan.bounds,		scan.bounds,
	scan.selected,		scan.selected,
	scan_disparity, // scan.disparity_map[ImageDtt.DISPARITY_INDEX_CM],		scan_disparity, // scan.disparity_map[ImageDtt.DISPARITY_INDEX_CM],
	@@ -5286,7 +5287,8 @@ public class QuadCLT {
	tp.showScan(		tp.showScan(
	tp.clt_3d_passes.get(next_pass-1), // CLTPass3d scan,		tp.clt_3d_passes.get(next_pass-1), // CLTPass3d scan,
	"after_pass2-"+(next_pass-1)); //String title)		"after_pass2-"+(next_pass-1)); //String title)
	tp.thirdPassSetup( // prepare tile tasks for the second pass based on the previous one(s)		// tp.thirdPassSetup( // prepare tile tasks for the second pass based on the previous one(s)
			tp.thirdPassSetupSurf( // prepare tile tasks for the second pass based on the previous one(s)
	clt_parameters,		clt_parameters,
	clt_parameters.bgnd_range, // double disparity_far,		clt_parameters.bgnd_range, // double disparity_far,
	clt_parameters.grow_disp_max, // other_range, //double disparity_near, //		clt_parameters.grow_disp_max, // other_range, //double disparity_near, //
	@@ -5323,11 +5325,6 @@ public class QuadCLT {
	threadsMax, // maximal number of threads to launch		threadsMax, // maximal number of threads to launch
	updateStatus,		updateStatus,
	debugLevel);		debugLevel);
	/**
	if ((scanIndex == 49) \|\| (scanIndex == 54) ) tp.showScan(
	scan, // tp.clt_3d_passes.get(scanIndex), // CLTPass3d scan,
	"MEASURED-"+scanIndex);
	*/
	}		}

	// TEMPORARY EXIT		// TEMPORARY EXIT
	@@ -5353,13 +5350,14 @@ public class QuadCLT {

	CLTPass3d scan = tp.clt_3d_passes.get(scanIndex);		CLTPass3d scan = tp.clt_3d_passes.get(scanIndex);

			/*
	if ((scanIndex == 73) ) {		if ((scanIndex == 73) ) {
	tp.showScan(		tp.showScan(
	tp.clt_3d_passes.get(scanIndex), // CLTPass3d scan,		tp.clt_3d_passes.get(scanIndex), // CLTPass3d scan,
	"SELECTED-"+scanIndex);		"SELECTED-"+scanIndex);
	}		}

			*/

	// TODO: use new updated disparity, for now just what was forced for the picture		// TODO: use new updated disparity, for now just what was forced for the picture
	double [] scan_disparity = new double [tilesX * tilesY];		double [] scan_disparity = new double [tilesX * tilesY];
	@@ -5383,17 +5381,21 @@ public class QuadCLT {
	scan_disparity[i] = sdw;		scan_disparity[i] = sdw;
	}		}
	}		}
			/*
	if ((scanIndex == 73)) {		if ((scanIndex == 73)) {
	tp.showScan(		tp.showScan(
	tp.clt_3d_passes.get(scanIndex), // CLTPass3d scan,		tp.clt_3d_passes.get(scanIndex), // CLTPass3d scan,
	"X3D-"+scanIndex);		"X3D-"+scanIndex);
	}		}
	boolean showTri = ((scanIndex < next_pass + 1) && clt_parameters.show_triangles) \|\|(scanIndex == 73);		*/
			// boolean showTri = ((scanIndex < next_pass + 1) && clt_parameters.show_triangles) \|\|(scanIndex < 3);
			boolean showTri = ((scanIndex < next_pass + 1) && clt_parameters.show_triangles) \|\|((scanIndex - next_pass) == 73);

	// boolean showTri = ((scanIndex < next_pass + 1) && clt_parameters.show_triangles) \|\|(scanIndex == 49) \|\| (scanIndex == 54);		// boolean showTri = ((scanIndex < next_pass + 1) && clt_parameters.show_triangles) \|\|(scanIndex == 49) \|\| (scanIndex == 54);
	generateClusterX3d(		generateClusterX3d(
	x3dOutput,		x3dOutput,
	texturePath,		texturePath,
			"shape_id-"+(scanIndex - next_pass), // id
	scan.bounds,		scan.bounds,
	scan.selected,		scan.selected,
	scan_disparity, // scan.disparity_map[ImageDtt.DISPARITY_INDEX_CM],		scan_disparity, // scan.disparity_map[ImageDtt.DISPARITY_INDEX_CM],
	@@ -5429,6 +5431,7 @@ public class QuadCLT {
	public void generateClusterX3d(		public void generateClusterX3d(
	X3dOutput x3dOutput,		X3dOutput x3dOutput,
	String texturePath,		String texturePath,
			String id,
	Rectangle bounds,		Rectangle bounds,
	boolean [] selected,		boolean [] selected,
	double [] disparity,		double [] disparity,
	@@ -5486,6 +5489,7 @@ public class QuadCLT {

	x3dOutput.addCluster(		x3dOutput.addCluster(
	texturePath,		texturePath,
			id,
	texCoord,		texCoord,
	worldXYZ,		worldXYZ,
	triangles);		triangles);

Original line number	Original line	Diff line number	Diff line
	@@ -2171,7 +2171,8 @@ public class EyesisCorrectionParameters {
	public double plMaxEigen = 0.3; // Maximal eigenvalue of a plane		public double plMaxEigen = 0.3; // Maximal eigenvalue of a plane
	public boolean plDbgMerge = true; // Combine 'other' plane with current		public boolean plDbgMerge = true; // Combine 'other' plane with current
	public double plWorstWorsening = 3.0; // Worst case worsening after merge		public double plWorstWorsening = 3.0; // Worst case worsening after merge
	public double plOKMergeEigen = 0.01; // If result of the merged planes is below, OK to bypass worst worsening		public double plOKMergeEigen = 0.03; // If result of the merged planes is below, OK to bypass worst worsening
			public double plMaxWorldSin2 = 0.1; // Maximal sine squared of the world angle between planes to merge. Set to >= 1.0 to disable
	public double plWeakWorsening = 1.0; // Relax merge requirements for weaker planes		public double plWeakWorsening = 1.0; // Relax merge requirements for weaker planes
	public boolean plMutualOnly = true; // keep only mutual links, remove weakest if conflict		public boolean plMutualOnly = true; // keep only mutual links, remove weakest if conflict
	public boolean plFillSquares = true; // Add diagonals to full squares		public boolean plFillSquares = true; // Add diagonals to full squares
	@@ -2217,12 +2218,13 @@ public class EyesisCorrectionParameters {
	public double msScaleProj = 1.5; // Scale projection of the plane ellipsoid		public double msScaleProj = 1.5; // Scale projection of the plane ellipsoid
	public double msFractUni = 0.3; // Spread this fraction of the ellipsoid weight among extended (double) supertile		public double msFractUni = 0.3; // Spread this fraction of the ellipsoid weight among extended (double) supertile

	public boolean tsNoEdge = true; // Do not assigned tiles to thesurface edges (not having all 8 neighbors)		public boolean tsNoEdge = true; // Do not assign tiles to the surface edges (not having all 8 neighbors)
			public boolean tsUseCenter = true; // Only assign outside of 8x8 center if no suitable alternative
	public double tsMaxDiff = 0.3; // Maximal disparity difference when assigning tiles		public double tsMaxDiff = 0.3; // Maximal disparity difference when assigning tiles
	public double tsMinDiffOther = 0.35; // Minimal disparity difference to be considered as a competitor surface		public double tsMinDiffOther = 0.35; // Minimal disparity difference to be considered as a competitor surface
	public double tsMinStrength = 0.05; // Minimal tile correlation strength to be assigned		public double tsMinStrength = 0.05; // Minimal tile correlation strength to be assigned
	public double tsMaxStrength = 10.0; // Maximal tile correlation strength to be assigned		public double tsMaxStrength = 10.0; // Maximal tile correlation strength to be assigned
	public double tsMinSurface = 0.0001; // Minimal surface strength at the tile location		public double tsMinSurface = 0.001; // Minimal surface strength at the tile location
	public int tsMoveDirs = 3; // Allowed tile disparity correction: 1 increase, 2 - decrease, 3 - both directions		public int tsMoveDirs = 3; // Allowed tile disparity correction: 1 increase, 2 - decrease, 3 - both directions
	public double tsSurfStrPow = 0.0; // Raise surface strengths ratio to this power when comparing candidates		public double tsSurfStrPow = 0.0; // Raise surface strengths ratio to this power when comparing candidates
	public double tsAddStrength = 0.01; // Add to strengths when calculating pull of assigned tiles		public double tsAddStrength = 0.01; // Add to strengths when calculating pull of assigned tiles
	@@ -2517,6 +2519,7 @@ public class EyesisCorrectionParameters {
	properties.setProperty(prefix+"plDbgMerge", this.plDbgMerge+"");		properties.setProperty(prefix+"plDbgMerge", this.plDbgMerge+"");
	properties.setProperty(prefix+"plWorstWorsening", this.plWorstWorsening +"");		properties.setProperty(prefix+"plWorstWorsening", this.plWorstWorsening +"");
	properties.setProperty(prefix+"plOKMergeEigen", this.plOKMergeEigen +"");		properties.setProperty(prefix+"plOKMergeEigen", this.plOKMergeEigen +"");
			properties.setProperty(prefix+"plMaxWorldSin2", this.plMaxWorldSin2 +"");
	properties.setProperty(prefix+"plWeakWorsening", this.plWeakWorsening +"");		properties.setProperty(prefix+"plWeakWorsening", this.plWeakWorsening +"");
	properties.setProperty(prefix+"plMutualOnly", this.plMutualOnly+"");		properties.setProperty(prefix+"plMutualOnly", this.plMutualOnly+"");
	properties.setProperty(prefix+"plFillSquares", this.plFillSquares+"");		properties.setProperty(prefix+"plFillSquares", this.plFillSquares+"");
	@@ -2557,6 +2560,7 @@ public class EyesisCorrectionParameters {
	properties.setProperty(prefix+"msFractUni", this.msFractUni +"");		properties.setProperty(prefix+"msFractUni", this.msFractUni +"");

	properties.setProperty(prefix+"tsNoEdge", this.tsNoEdge+"");		properties.setProperty(prefix+"tsNoEdge", this.tsNoEdge+"");
			properties.setProperty(prefix+"tsUseCenter", this.tsUseCenter+"");
	properties.setProperty(prefix+"tsMaxDiff", this.tsMaxDiff +"");		properties.setProperty(prefix+"tsMaxDiff", this.tsMaxDiff +"");
	properties.setProperty(prefix+"tsMinDiffOther", this.tsMinDiffOther +"");		properties.setProperty(prefix+"tsMinDiffOther", this.tsMinDiffOther +"");
	properties.setProperty(prefix+"tsMinStrength", this.tsMinStrength +"");		properties.setProperty(prefix+"tsMinStrength", this.tsMinStrength +"");
	@@ -2842,6 +2846,7 @@ public class EyesisCorrectionParameters {

Admin message