Commit c9ed0a3d authored by Andrey Filippov's avatar Andrey Filippov
Browse files

trying filtering by SIFT-like features for better averaging

parent 1517acca

src/main/java/com/elphel/imagej/correction/Eyesis_Correction.java

+15 −4
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ import com.elphel.imagej.jp4.JP46_Reader_camera; 
import com.elphel.imagej.lwir.LwirReader;

import com.elphel.imagej.orthomosaic.OrthoMap;

import com.elphel.imagej.orthomosaic.ComboMatch;

import com.elphel.imagej.orthomosaic.OrangeTest;

import com.elphel.imagej.readers.ChangeImageResolution;

import com.elphel.imagej.readers.DumpImageMetadata;

import com.elphel.imagej.readers.ElphelTiffReader;
@@ -165,7 +166,7 @@ public class Eyesis_Correction implements PlugIn, ActionListener { 
//	private static final long serialVersionUID = -1507307664341265263L;

	private Panel panel1, panel2, panel3, panel4, panel5, panel5a, panel6, panel7, panelPostProcessing1,

			panelPostProcessing2, panelPostProcessing3, panelDct1, panelClt1, panelClt2, panelClt3, panelClt4,

			panelClt5, panelClt5aux, panelClt_GPU, panelLWIR, panelLWIR16, panelLWIRWorld;

			panelClt5, panelClt5aux, panelClt_GPU, panelLWIR, panelLWIR16, panelLWIRWorld, panelOrange;

	JP46_Reader_camera JP4_INSTANCE = null;









//   private deBayerScissors debayer_instance;










@@ -532,7 +533,7 @@ public class Eyesis_Correction implements PlugIn, ActionListener {







		plugInFrame.addKeyListener(IJ.getInstance());









//		int menuRows=4 + (ADVANCED_MODE?4:0) + (MODE_3D?3:0) + (DCT_MODE?6:0) + (GPU_MODE?1:0) +(LWIR_MODE?2:0);









		int menuRows = 4 + (ADVANCED_MODE ? 4 : 0) + (MODE_3D ? 3 : 0) + (DCT_MODE ? 7 : 0) + (GPU_MODE ? 1 : 0)









				+ (LWIR_MODE ? 3 : 0);









				+ (LWIR_MODE ? 4 : 0);









		plugInFrame.setLayout(new GridLayout(menuRows, 1));









		panel6 = new Panel();









		panel6.setLayout(new GridLayout(1, 0, 5, 5));










@@ -861,6 +862,11 @@ public class Eyesis_Correction implements PlugIn, ActionListener {







			addButton("Properties compare",  panelLWIRWorld, color_process);









			plugInFrame.add(panelLWIRWorld);

















			panelOrange = new Panel();









			panelOrange.setLayout(new GridLayout(1, 0, 5, 5)); // rows, columns, vgap, hgap









			addButton("Test Orange", panelOrange, color_process);









			addButton("Process Merged", panelOrange, color_process);









			plugInFrame.add(panelOrange);









		}









		plugInFrame.pack();









//"LWIR batch"










@@ -5788,7 +5794,12 @@ public class Eyesis_Correction implements PlugIn, ActionListener {







			OrthoMap.testPatternCorrelate(imp_sel);









		} else if (label.equals("Properties compare")) {









			QuadCLTCPU.compareProperties();









		} else if (label.equals("Test Orange")) {









			OrangeTest.testOrange();			









		} else if (label.equals("Process Merged")) {









			OrangeTest.processMerged();			









		}









		//









	}









// 









	public boolean debugInitOneScene() {


































src/main/java/com/elphel/imagej/orthomosaic/ComboMatch.java



+3
−2






























Original line number
Diff line number
Diff line







@@ -2524,10 +2524,10 @@ adjusted affines[1] for a pair: 1694564291_293695/1694564778_589341







				{  0,   0, sxy, sy2,  0, sy},









				{  0,   0,  sx,  sy,  0, s0}};









		Matrix A = new Matrix(a);









		A.print(15,4);









//		A.print(15,4);









		double [][] b = {{sxu,syu,su,sxv,syv,sv}};









		Matrix B = new Matrix(b).transpose();









		B.print(15,4);









//		B.print(15,4);









		double [] v = A.solve(B).getRowPackedCopy();









		double [][] ab = {









				{v[0], v[1]},   // |a00, a01|,










@@ -2535,6 +2535,7 @@ adjusted affines[1] for a pair: 1694564291_293695/1694564778_589341







				{v[4], v[5]}};  // | b0,  b1|,









		return ab;	









	}









	









	public static boolean testReadTiff() {









		String image_paths="";