more debugging planes merging (cee97f1b) · Commits · Elphel / imagej-elphel

src/main/java/CLTPass3d.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -515,6 +515,10 @@ public class CLTPass3d{
		return weakOutlayers;
		}

		public SuperTiles getSuperTiles()
		{
		return this.superTiles;
		}

		public SuperTiles setSuperTiles(
		double step_near,

src/main/java/EyesisCorrectionParameters.java

+13 −2

Original line number	Diff line number	Diff line
		@@ -1921,7 +1921,7 @@ public class EyesisCorrectionParameters {
		public int ishift_x = 0; // debug feature - shift source image by this pixels left
		public int ishift_y = 0; // debug feature - shift source image by this pixels down
		public double fat_zero = 0.0; // modify phase correlation to prevent division by very small numbers
		public double corr_sigma = 0.8; // LPF correlarion sigma
		public double corr_sigma = 0.8; // LPF correlation sigma
		public boolean norm_kern = true; // normalize kernels
		public boolean gain_equalize = false;// equalize green channel gain
		public boolean colors_equalize = true; // equalize R/G, B/G of the individual channels
		@@ -2150,6 +2150,9 @@ public class EyesisCorrectionParameters {
		public double plMinStrength = 0.1; // Minimal total strength of a plane
		public double plMaxEigen = 0.3; // Maximal eigenvalue of a plane
		public boolean plDbgMerge = true; // Combine 'other' plane with current
		public double plWorstWorsening = 2.0; // Worst case worsening after merge
		public boolean plMutualOnly = true; // keep only mutual links, remove weakest if conflict


		// other debug images
		public boolean show_ortho_combine = false; // Show 'ortho_combine'
		@@ -2391,6 +2394,8 @@ public class EyesisCorrectionParameters {
		properties.setProperty(prefix+"plMinStrength", this.plMinStrength +"");
		properties.setProperty(prefix+"plMaxEigen", this.plMaxEigen +"");
		properties.setProperty(prefix+"plDbgMerge", this.plDbgMerge+"");
		properties.setProperty(prefix+"plWorstWorsening", this.plWorstWorsening +"");
		properties.setProperty(prefix+"plMutualOnly", this.plMutualOnly+"");

		properties.setProperty(prefix+"show_ortho_combine", this.show_ortho_combine+"");
		properties.setProperty(prefix+"show_refine_supertiles", this.show_refine_supertiles+"");
		@@ -2623,6 +2628,8 @@ public class EyesisCorrectionParameters {
		if (properties.getProperty(prefix+"plMinStrength")!=null) this.plMinStrength=Double.parseDouble(properties.getProperty(prefix+"plMinStrength"));
		if (properties.getProperty(prefix+"plMaxEigen")!=null) this.plMaxEigen=Double.parseDouble(properties.getProperty(prefix+"plMaxEigen"));
		if (properties.getProperty(prefix+"plDbgMerge")!=null) this.plDbgMerge=Boolean.parseBoolean(properties.getProperty(prefix+"plDbgMerge"));
		if (properties.getProperty(prefix+"plWorstWorsening")!=null) this.plWorstWorsening=Double.parseDouble(properties.getProperty(prefix+"plWorstWorsening"));
		if (properties.getProperty(prefix+"plMutualOnly")!=null) this.plMutualOnly=Boolean.parseBoolean(properties.getProperty(prefix+"plMutualOnly"));

		if (properties.getProperty(prefix+"show_ortho_combine")!=null) this.show_ortho_combine=Boolean.parseBoolean(properties.getProperty(prefix+"show_ortho_combine"));
		if (properties.getProperty(prefix+"show_refine_supertiles")!=null) this.show_refine_supertiles=Boolean.parseBoolean(properties.getProperty(prefix+"show_refine_supertiles"));
		@@ -2877,6 +2884,8 @@ public class EyesisCorrectionParameters {
		gd.addNumericField("Minimal total strength of a plane", this.plMinStrength, 6);
		gd.addNumericField("Maximal eigenvalue of a plane", this.plMaxEigen, 6);
		gd.addCheckbox ("Combine 'other' plane with the current", this.plDbgMerge);
		gd.addNumericField("Worst case worsening after merge", this.plWorstWorsening, 6);
		gd.addCheckbox ("Keep only mutual links, remove weakest if conflict", this.plMutualOnly);

		gd.addMessage ("--- Other debug images ---");
		gd.addCheckbox ("Show 'ortho_combine'", this.show_ortho_combine);
		@@ -3118,6 +3127,8 @@ public class EyesisCorrectionParameters {
		this.plMinStrength= gd.getNextNumber();
		this.plMaxEigen= gd.getNextNumber();
		this.plDbgMerge= gd.getNextBoolean();
		this.plWorstWorsening= gd.getNextNumber();
		this.plMutualOnly= gd.getNextBoolean();

		this.show_ortho_combine= gd.getNextBoolean();
		this.show_refine_supertiles= gd.getNextBoolean();

src/main/java/Eyesis_Correction.java

+15 −5

Original line number	Diff line number	Diff line
		@@ -506,6 +506,7 @@ private Panel panel1,
		addButton("CLT apply fine corr", panelClt1, color_process);
		addButton("CLT reset 3D", panelClt1, color_stop);
		addButton("CLT 3D", panelClt1, color_conf_process);
		addButton("CLT planes", panelClt1, color_conf_process);

		add(panelClt1);
		}
		@@ -4764,13 +4765,22 @@ private Panel panel1,
		}
		return;

		} else if (label.equals("CLT planes")) {
		DEBUG_LEVEL=MASTER_DEBUG_LEVEL;
		EYESIS_CORRECTIONS.setDebug(DEBUG_LEVEL);
		if (QUAD_CLT == null){
		System.out.println("QUAD_CLT is null, nothing to show");
		return;
		}




		//"CLT planes"
		QUAD_CLT.showCLTPlanes(
		CLT_PARAMETERS, // EyesisCorrectionParameters.DCTParameters dct_parameters,
		THREADS_MAX, //final int threadsMax, // maximal number of threads to launch
		UPDATE_STATUS, //final boolean updateStatus,
		DEBUG_LEVEL); //final int debugLevel);
		return;
		//


		// End of buttons code
		}
		DEBUG_LEVEL=MASTER_DEBUG_LEVEL;

src/main/java/QuadCLT.java

+32 −0

Original line number	Diff line number	Diff line
		@@ -4458,6 +4458,30 @@ public class QuadCLT {
		return rslt;
		}
		// public ImagePlus [] cltDisparityScan(
		public void showCLTPlanes(
		EyesisCorrectionParameters.CLTParameters clt_parameters,
		final int threadsMax, // maximal number of threads to launch
		final boolean updateStatus,
		final int debugLevel)
		{
		if (tp == null){
		System.out.println("showCLTPlanes(): tp is null");
		return;
		}
		if (tp.clt_3d_passes == null){
		System.out.println("showCLTPlanes(): tp.clt_3d_passes is null");
		return;
		}
		tp.showPlanes(
		clt_parameters,
		threadsMax,
		updateStatus,
		debugLevel);
		// CLTPass3d last_scan = tp.clt_3d_passes.get(tp.clt_3d_passes.size() -1); // get last one

		}



		public void processCLTQuads3d(
		EyesisCorrectionParameters.CLTParameters clt_parameters,
		@@ -5062,6 +5086,14 @@ public class QuadCLT {
		2); // debugLevel);
		// get images for predefined regions and disparities. First - with just fixed scans 1 .. list.size()

		// TEMPORARY EXIT

		if (tp.clt_3d_passes.size() > 0) {
		System.out.println("-------- temporary exit after secondPassSetup() ------- ");
		return null; // just to fool compiler
		}


		tp.showScan(
		tp.clt_3d_passes.get(next_pass-1), // CLTPass3d scan,
		"after_pass2-"+(next_pass-1)); //String title)

Admin message