committing w/o breaking - 1 (61820deb) · Commits · Elphel / imagej-elphel

src/main/java/com/elphel/imagej/calibration/Distortions.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4276,7 +4276,7 @@ List calibration
	}		}

	public boolean removeOutLierSets(int numOutLiers){		public boolean removeOutLierSets(int numOutLiers){
	boolean removeEmptySets=false;		boolean removeEmptySets=true; // false;
	if (numOutLiers<0) {		if (numOutLiers<0) {
	GenericDialog gd = new GenericDialog("Select sets to process");		GenericDialog gd = new GenericDialog("Select sets to process");
	gd.addNumericField("Series number (<0 - all images)", -1, 0);		gd.addNumericField("Series number (<0 - all images)", -1, 0);

+13 −7

Original line number	Original line	Diff line number	Diff line
	@@ -1105,8 +1105,14 @@ Cv=(Cyx-Cxy)+(-CyDx+CxDy)
	result[index]=spixels[(ixi+iyi) & 1][iy*full_width+ix];		result[index]=spixels[(ixi+iyi) & 1][iy*full_width+ix];
	}		}
	} else { // components 0..3		} else { // components 0..3
			int ser;
			if (colorComp < 0) {
			ser = 1; // offset by 1/2 pix? should it be so? // FIXME: verify and fix if needed - compare to extractSimulMono()
			} else {
			ser = 0;
	r.x+=(bayerPeriod/2)*(colorComp &1);		r.x+=(bayerPeriod/2)*(colorComp &1);
	r.y+=(bayerPeriod/2)*((colorComp>>1) &1);		r.y+=(bayerPeriod/2)*((colorComp>>1) &1);
			}
	if (debugLevel>2) System.out.println(">>> r.width="+r.width+		if (debugLevel>2) System.out.println(">>> r.width="+r.width+
	" r.height="+r.height+		" r.height="+r.height+
	" r.x="+r.x+		" r.x="+r.x+
	@@ -1119,7 +1125,7 @@ Cv=(Cyx-Cxy)+(-CyDx+CxDy)
	else if (iy >= full_height) iy = full_height - 1;		else if (iy >= full_height) iy = full_height - 1;
	if (ix < 0) ix = 0;		if (ix < 0) ix = 0;
	else if (ix >= full_width) iy = full_width - 1;		else if (ix >= full_width) iy = full_width - 1;
	result[index]=spixels[0][iy*full_width+ix];		result[index] = spixels[ser][iy * full_width + ix];
	}		}
	}		}
	return result;		return result;