Commit 446646b6 authored by Andrey Filippov's avatar Andrey Filippov
Browse files

Started refactoring to get rid of default package

parent 6f3a4fba

src/main/java/BiQuadParameters.java

+24 −22
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 


import java.util.Properties;



import com.elphel.imagej.common.GenericJTabbedDialog;



public class BiQuadParameters {

	public boolean rig_mode_debug =            true;

	public boolean no_int_x0 =                 true; // do not offset window to integer maximum for the rig - used when averaging low textures to avoid "jumps" for very wide maximums
@@ -1223,8 +1225,8 @@ public class BiQuadParameters { 
		if (properties.getProperty(prefix+"lt_replace_lone")!=null)         this.lt_replace_lone=Boolean.parseBoolean(properties.getProperty(prefix+"lt_replace_lone"));

		if (properties.getProperty(prefix+"lt_extend_dist")!=null)          this.lt_extend_dist=Integer.parseInt(properties.getProperty(prefix+"lt_extend_dist"));

		if (properties.getProperty(prefix+"lt_wsigma")!=null)               this.lt_wsigma=Double.parseDouble(properties.getProperty(prefix+"lt_wsigma"));

		if (properties.getProperty(prefix+"lt_max_asigma")!=null)           this.lt_max_asigma=Double.parseDouble(properties.getProperty(prefix+"lt_max_sigma"));

		if (properties.getProperty(prefix+"lt_max_rsigma")!=null)           this.lt_max_rsigma=Double.parseDouble(properties.getProperty(prefix+"lt_max_sigma"));

		if (properties.getProperty(prefix+"lt_max_asigma")!=null)           this.lt_max_asigma=Double.parseDouble(properties.getProperty(prefix+"lt_max_asigma"));

		if (properties.getProperty(prefix+"lt_max_rsigma")!=null)           this.lt_max_rsigma=Double.parseDouble(properties.getProperty(prefix+"lt_max_rsigma"));



		if (properties.getProperty(prefix+"lt_repeat")!=null)               this.lt_repeat=Integer.parseInt(properties.getProperty(prefix+"lt_repeat"));

		if (properties.getProperty(prefix+"lt_min_new")!=null)              this.lt_min_new=Integer.parseInt(properties.getProperty(prefix+"lt_min_new"));

src/main/java/CorrectionColorProc.java

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
import java.util.Properties;

import java.util.concurrent.atomic.AtomicInteger;



import com.elphel.imagej.common.GenericJTabbedDialog;



import ij.ImageStack;

import ij.gui.GenericDialog;

src/main/java/EyesisCorrectionParameters.java

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ import java.util.HashMap; 
import java.util.Properties;

import java.util.Set;









import com.elphel.imagej.common.GenericJTabbedDialog;

















import ij.IJ;









import ij.Prefs;









import ij.gui.GenericDialog;


































src/main/java/Eyesis_Correction.java



+10
−6






























Original line number
Diff line number
Diff line







@@ -70,6 +70,7 @@ import java.util.concurrent.atomic.AtomicInteger;







import javax.swing.JFileChooser;









import javax.swing.filechooser.FileFilter;



















import com.elphel.imagej.common.GenericJTabbedDialog;









import com.elphel.imagej.lwir.LwirReader;



















import ij.CompositeImage;










@@ -159,6 +160,7 @@ private Panel panel1,







   public static QuadCLT          QUAD_CLT_AUX =   null;









   public static TwoQuadCLT       TWO_QUAD_CLT = null;









   public static GPUTileProcessor GPU_TILE_PROCESSOR = null;









   public static LwirReader       LWIR_READER = null;



















   public static EyesisCorrectionParameters.DebayerParameters DEBAYER_PARAMETERS = new EyesisCorrectionParameters.DebayerParameters(









		   64,    // size //128;










@@ -4805,9 +4807,12 @@ private Panel panel1,







/* ======================================================================== */









    } else if (label.equals("LWIR_ACQUIRE")) {









        DEBUG_LEVEL=MASTER_DEBUG_LEVEL;









		loci.common.DebugTools.enableLogging("ERROR"); // INFO"); // ERROR");









        LwirReader lwirReader = new LwirReader();









        ImagePlus [][] imps = lwirReader.readAllMultiple(









		loci.common.DebugTools.enableLogging((DEBUG_LEVEL > 1)?"DEBUG":((DEBUG_LEVEL > 0)?"INFO":"ERROR")); // INFO"); // ERROR");









		//   public static LwirReader       LWIR_READER = null;









		if (LWIR_READER == null) {









			LWIR_READER =  new LwirReader();









		}









        ImagePlus [][] imps = LWIR_READER.readAllMultiple(









    			10, // final int     num_frames,









    			true, // final boolean show,









    			false); // true); // final boolean scale)










@@ -4816,15 +4821,14 @@ private Panel panel1,







		}



















		System.out.println("LWIR_ACQUIRE: got "+imps.length+" image sets");









		ImagePlus [][] imps_sync =  lwirReader.matchSets(imps, 0.001, 3); // double max_mismatch)









		ImagePlus [][] imps_sync =  LWIR_READER.matchSets(imps, 0.001, 3); // double max_mismatch)









		if (imps_sync != null) {









			ImagePlus [] imps_avg = lwirReader.averageMultiFrames(imps_sync);









			ImagePlus [] imps_avg = LWIR_READER.averageMultiFrames(imps_sync);









			for (ImagePlus imp: imps_avg) {









				imp.show();









			}









		}





























//JTabbedTest









// End of buttons code









    }


































src/main/java/GeometryCorrection.java



+2
−0






























Original line number
Diff line number
Diff line









import java.util.ArrayList;









import java.util.Properties;



















import com.elphel.imagej.common.GenericJTabbedDialog;



















import Jama.Matrix;









import ij.IJ;