Commit 7af3b919 authored by Andrey Filippov's avatar Andrey Filippov

And even more refactoring

parent 973a1bdd
......@@ -69,17 +69,17 @@ import com.elphel.imagej.calibration.CalibrationHardwareInterface.PowerControl;
import com.elphel.imagej.calibration.CalibrationHardwareInterface.UVLEDandLasers;
import com.elphel.imagej.calibration.Distortions.RefineParameters;
import com.elphel.imagej.calibration.SimulationPattern.SimulParameters;
import com.elphel.imagej.cameras.EyesisCameraParameters;
import com.elphel.imagej.cameras.SFEPhases;
import com.elphel.imagej.cameras.SFEPhases.Defect;
import com.elphel.imagej.cameras.SFEPhases.SensorDefects;
import com.elphel.imagej.common.DoubleFHT;
import com.elphel.imagej.common.DoubleGaussianBlur;
import com.elphel.imagej.common.PolynomialApproximation;
import com.elphel.imagej.common.ShowDoubleFloatArrays;
import com.elphel.imagej.dp.EyesisCameraParameters;
import com.elphel.imagej.common.WindowTools;
import com.elphel.imagej.dp.LensDistortionParameters;
import com.elphel.imagej.dp.PolynomialApproximation;
import com.elphel.imagej.dp.SFEPhases;
import com.elphel.imagej.dp.WavePatternGenerator;
import com.elphel.imagej.dp.WindowTools;
import com.elphel.imagej.dp.SFEPhases.Defect;
import com.elphel.imagej.dp.SFEPhases.SensorDefects;
import com.elphel.imagej.jp4.JP46_Reader_camera;
import Jama.Matrix; // Download here: http://math.nist.gov/javanumerics/jama/
......@@ -70,8 +70,8 @@ import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.xml.sax.SAXException;
import com.elphel.imagej.dp.PolynomialApproximation;
import com.elphel.imagej.dp.WindowTools;
import com.elphel.imagej.common.PolynomialApproximation;
import com.elphel.imagej.common.WindowTools;
import com.elphel.imagej.jp4.JP46_Reader_camera;
import Jama.LUDecomposition;
......
......@@ -30,9 +30,9 @@ import java.util.concurrent.atomic.AtomicInteger;
import javax.swing.SwingUtilities;
import com.elphel.imagej.cameras.EyesisCorrectionParameters;
import com.elphel.imagej.common.DoubleFHT;
import com.elphel.imagej.common.ShowDoubleFloatArrays;
import com.elphel.imagej.dp.EyesisCorrectionParameters;
import ij.IJ;
import ij.ImageStack;
......
......@@ -35,12 +35,12 @@ import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.configuration.XMLConfiguration;
import com.elphel.imagej.cameras.EyesisCameraParameters;
import com.elphel.imagej.cameras.EyesisSubCameraParameters;
import com.elphel.imagej.common.DoubleGaussianBlur;
import com.elphel.imagej.common.PolynomialApproximation;
import com.elphel.imagej.common.ShowDoubleFloatArrays;
import com.elphel.imagej.dp.EyesisCameraParameters;
import com.elphel.imagej.dp.EyesisSubCameraParameters;
import com.elphel.imagej.dp.PolynomialApproximation;
import com.elphel.imagej.dp.WindowTools;
import com.elphel.imagej.common.WindowTools;
import com.elphel.imagej.jp4.JP46_Reader_camera;
import ij.IJ;
......
......@@ -30,7 +30,7 @@ import ij.gui.GenericDialog;
import java.io.File;
import java.util.Properties;
import com.elphel.imagej.dp.WindowTools;
import com.elphel.imagej.common.WindowTools;
public class DistortionProcessConfiguration{
......
......@@ -35,13 +35,13 @@ import java.util.concurrent.atomic.AtomicInteger;
import javax.swing.SwingUtilities;
import com.elphel.imagej.cameras.EyesisCameraParameters;
import com.elphel.imagej.cameras.EyesisSubCameraParameters;
import com.elphel.imagej.common.DoubleGaussianBlur;
import com.elphel.imagej.common.PolynomialApproximation;
import com.elphel.imagej.common.ShowDoubleFloatArrays;
import com.elphel.imagej.dp.EyesisCameraParameters;
import com.elphel.imagej.dp.EyesisSubCameraParameters;
import com.elphel.imagej.common.WindowTools;
import com.elphel.imagej.dp.LensDistortionParameters;
import com.elphel.imagej.dp.PolynomialApproximation;
import com.elphel.imagej.dp.WindowTools;
import com.elphel.imagej.jp4.JP46_Reader_camera;
import Jama.LUDecomposition;
......
......@@ -24,7 +24,7 @@ import com.elphel.imagej.calibration.SimulationPattern.SimulParameters;
import com.elphel.imagej.common.DoubleFHT;
import com.elphel.imagej.common.DoubleGaussianBlur;
import com.elphel.imagej.common.ShowDoubleFloatArrays;
import com.elphel.imagej.dp.WindowTools;
import com.elphel.imagej.common.WindowTools;
import com.elphel.imagej.jp4.JP46_Reader_camera;
public class EyesisAberrations {
......
......@@ -38,7 +38,7 @@ import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.XMLConfiguration;
import com.elphel.imagej.calibration.CalibrationFileManagement.MultipleExtensionsFileFilter;
import com.elphel.imagej.dp.WindowTools;
import com.elphel.imagej.common.WindowTools;
import ij.IJ;
import ij.gui.GenericDialog;
......
......@@ -45,7 +45,7 @@ import org.apache.commons.configuration.XMLConfiguration;
import com.elphel.imagej.calibration.CalibrationFileManagement.MultipleExtensionsFileFilter;
import com.elphel.imagej.common.ShowDoubleFloatArrays;
import com.elphel.imagej.dp.WindowTools;
import com.elphel.imagej.common.WindowTools;
//import Distortions.LMAArrays; // may still reuse?
import Jama.LUDecomposition;
......
......@@ -32,9 +32,9 @@ import java.util.concurrent.atomic.AtomicInteger;
import com.elphel.imagej.calibration.CalibrationHardwareInterface.CamerasInterface;
import com.elphel.imagej.calibration.CalibrationHardwareInterface.GoniometerMotors;
import com.elphel.imagej.calibration.SimulationPattern.SimulParameters;
import com.elphel.imagej.cameras.EyesisCameraParameters;
import com.elphel.imagej.common.ShowDoubleFloatArrays;
import com.elphel.imagej.dp.EyesisCameraParameters;
import com.elphel.imagej.dp.WindowTools;
import com.elphel.imagej.common.WindowTools;
import ij.IJ;
import ij.ImagePlus;
......
......@@ -27,7 +27,7 @@ import java.util.Properties;
import com.elphel.imagej.calibration.SimulationPattern.SimulParameters;
import com.elphel.imagej.common.ShowDoubleFloatArrays;
import com.elphel.imagej.dp.WindowTools;
import com.elphel.imagej.common.WindowTools;
import ij.IJ;
import ij.ImagePlus;
......
......@@ -39,9 +39,9 @@ import javax.swing.SwingUtilities;
import com.elphel.imagej.calibration.SimulationPattern.SimulParameters;
import com.elphel.imagej.common.DoubleFHT;
import com.elphel.imagej.common.DoubleGaussianBlur;
import com.elphel.imagej.common.PolynomialApproximation;
import com.elphel.imagej.common.ShowDoubleFloatArrays;
import com.elphel.imagej.dp.PolynomialApproximation;
import com.elphel.imagej.dp.WindowTools;
import com.elphel.imagej.common.WindowTools;
import com.elphel.imagej.jp4.JP46_Reader_camera;
import Jama.LUDecomposition;
......
package com.elphel.imagej.dp;
package com.elphel.imagej.cameras;
import java.util.Properties;
import org.apache.commons.configuration.XMLConfiguration;
import com.elphel.imagej.common.WindowTools;
/*
**
** EyesisCameraParameters.java
......
package com.elphel.imagej.dp;
package com.elphel.imagej.cameras;
/**
** -----------------------------------------------------------------------------**
** EyesisCorrectionParameters.java
......@@ -36,6 +36,12 @@ import java.util.Set;
import com.elphel.imagej.calibration.CalibrationFileManagement;
import com.elphel.imagej.common.GenericJTabbedDialog;
import com.elphel.imagej.common.WindowTools;
import com.elphel.imagej.dp.BiQuadParameters;
import com.elphel.imagej.dp.ImageDtt;
import com.elphel.imagej.dp.ImageDttParameters;
import com.elphel.imagej.dp.MeasuredLayersFilterParameters;
import com.elphel.imagej.dp.PoleProcessorParameters;
import ij.IJ;
import ij.Prefs;
......@@ -2326,7 +2332,7 @@ public class EyesisCorrectionParameters {
public double threshold;
public boolean useDiffNoiseGains;
public double [] noiseGainWeights=new double[3];
double blurSigma; // blur sigma for mask calculation (blur convolution kernels for noise gain calculation
public double blurSigma; // blur sigma for mask calculation (blur convolution kernels for noise gain calculation
public double noiseGainPower;
public boolean showMask;
// ring filter
......
package com.elphel.imagej.dp;
package com.elphel.imagej.cameras;
/*
**
** EyesisSubCameraParameters.java
......
package com.elphel.imagej.dp;
package com.elphel.imagej.cameras;
/**
** -----------------------------------------------------------------------------**
** SFEPhases.java
......@@ -48,6 +48,7 @@ import com.elphel.imagej.calibration.DistortionProcessConfiguration;
import com.elphel.imagej.calibration.EyesisAberrations;
import com.elphel.imagej.calibration.MatchSimulatedPattern;
import com.elphel.imagej.common.DoubleGaussianBlur;
import com.elphel.imagej.common.PolynomialApproximation;
import com.elphel.imagej.jp4.JP46_Reader_camera;
public class SFEPhases {
......
/**
*
*/
/**
* @author eyesis
*
*/
package com.elphel.imagej.cameras;
\ No newline at end of file
package com.elphel.imagej.dp;
package com.elphel.imagej.common;
import Jama.LUDecomposition;
import Jama.Matrix;
......
package com.elphel.imagej.dp;
package com.elphel.imagej.common;
//
// WindowTools.java
//
......
......@@ -57,6 +57,7 @@ import com.elphel.imagej.calibration.DeBayerScissors;
import com.elphel.imagej.common.DoubleFHT;
import com.elphel.imagej.common.DoubleGaussianBlur;
import com.elphel.imagej.common.ShowDoubleFloatArrays;
import com.elphel.imagej.common.WindowTools;
import com.elphel.imagej.jp4.JP46_Reader_camera;
//import javax.swing.SwingUtilities;
......
......@@ -24,7 +24,9 @@ package com.elphel.imagej.dp;
*/
import java.util.ArrayList;
import com.elphel.imagej.cameras.EyesisCorrectionParameters;
import com.elphel.imagej.common.DoubleGaussianBlur;
import com.elphel.imagej.common.PolynomialApproximation;
import com.elphel.imagej.common.ShowDoubleFloatArrays;
//import GeometryCorrection.CorrVector;
......
......@@ -26,6 +26,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.concurrent.atomic.AtomicInteger;
import com.elphel.imagej.common.PolynomialApproximation;
import com.elphel.imagej.common.ShowDoubleFloatArrays;
public class BiScan {
......
......@@ -30,6 +30,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import com.elphel.imagej.cameras.EyesisCorrectionParameters;
import com.elphel.imagej.common.DoubleGaussianBlur;
import com.elphel.imagej.common.ShowDoubleFloatArrays;
......
......@@ -29,9 +29,11 @@ package com.elphel.imagej.dp;
import java.util.Properties;
import java.util.concurrent.atomic.AtomicInteger;
import com.elphel.imagej.cameras.EyesisCorrectionParameters;
import com.elphel.imagej.common.DoubleGaussianBlur;
import com.elphel.imagej.common.GenericJTabbedDialog;
import com.elphel.imagej.common.ShowDoubleFloatArrays;
import com.elphel.imagej.common.WindowTools;
import ij.ImageStack;
import ij.gui.GenericDialog;
......
......@@ -31,6 +31,7 @@ import ij.ImageStack;
import java.util.concurrent.atomic.AtomicInteger;
import com.elphel.imagej.cameras.EyesisCorrectionParameters;
import com.elphel.imagej.common.DoubleFHT;
import com.elphel.imagej.common.DoubleGaussianBlur;
import com.elphel.imagej.common.ShowDoubleFloatArrays;
......
package com.elphel.imagej.dp;
import java.util.ArrayList;
import com.elphel.imagej.common.PolynomialApproximation;
import com.elphel.imagej.common.ShowDoubleFloatArrays;
/**
......
......@@ -51,6 +51,8 @@ package com.elphel.imagej.dp;
import java.util.ArrayList;
import java.util.HashMap;
import com.elphel.imagej.common.PolynomialApproximation;
import Jama.Matrix;
......
......@@ -26,6 +26,7 @@ package com.elphel.imagej.dp;
import java.util.ArrayList;
import java.util.concurrent.atomic.AtomicInteger;
import com.elphel.imagej.cameras.EyesisCorrectionParameters;
import com.elphel.imagej.common.ShowDoubleFloatArrays;
public class DisparityProcessor {
......
......@@ -26,6 +26,7 @@ package com.elphel.imagej.dp;
import java.util.ArrayList;
import java.util.concurrent.atomic.AtomicInteger;
import com.elphel.imagej.common.PolynomialApproximation;
import com.elphel.imagej.common.ShowDoubleFloatArrays;
......
......@@ -33,6 +33,7 @@ import javax.swing.SwingUtilities;
import com.elphel.imagej.calibration.DebayerScissorsClass;
import com.elphel.imagej.calibration.PixelMapping;
import com.elphel.imagej.cameras.EyesisCorrectionParameters;
import com.elphel.imagej.common.DoubleFHT;
import com.elphel.imagej.common.DoubleGaussianBlur;
import com.elphel.imagej.common.ShowDoubleFloatArrays;
......
......@@ -26,6 +26,7 @@ package com.elphel.imagej.dp;
import java.util.Properties;
import java.util.concurrent.atomic.AtomicInteger;
import com.elphel.imagej.cameras.EyesisCorrectionParameters;
import com.elphel.imagej.common.DoubleGaussianBlur;
import com.elphel.imagej.common.ShowDoubleFloatArrays;
......
......@@ -74,10 +74,12 @@ import javax.swing.filechooser.FileFilter;
import com.elphel.imagej.calibration.CalibrationFileManagement;
import com.elphel.imagej.calibration.DeBayerScissors;
import com.elphel.imagej.calibration.PixelMapping;
import com.elphel.imagej.cameras.EyesisCorrectionParameters;
import com.elphel.imagej.common.DoubleFHT;
import com.elphel.imagej.common.DoubleGaussianBlur;
import com.elphel.imagej.common.GenericJTabbedDialog;
import com.elphel.imagej.common.ShowDoubleFloatArrays;
import com.elphel.imagej.common.WindowTools;
import com.elphel.imagej.jp4.JP46_Reader_camera;
import com.elphel.imagej.lwir.LwirReader;
......
......@@ -24,6 +24,8 @@ package com.elphel.imagej.dp;
*/
import java.util.concurrent.atomic.AtomicInteger;
import com.elphel.imagej.cameras.EyesisCorrectionParameters;
import com.elphel.imagej.common.PolynomialApproximation;
import com.elphel.imagej.common.ShowDoubleFloatArrays;
import Jama.Matrix;
......
......@@ -2,6 +2,9 @@ package com.elphel.imagej.dp;
import java.util.Arrays;
import java.util.Properties;
import com.elphel.imagej.cameras.EyesisSubCameraParameters;
import com.elphel.imagej.common.WindowTools;
import ij.IJ;
import ij.gui.GenericDialog;
import Jama.Matrix;
......
......@@ -29,6 +29,7 @@ import java.util.Comparator;
import java.util.HashSet;
import java.util.concurrent.atomic.AtomicInteger;
import com.elphel.imagej.cameras.EyesisCorrectionParameters;
import com.elphel.imagej.common.ShowDoubleFloatArrays;
public class LinkPlanes {
......
package com.elphel.imagej.dp;
/**
**
** LwirCamera.java - Control/image acquisition for LWIR cameras
** (initially for Lepton 3.5 sensors, 103992 sesnor boards)
**
** Copyright (C) 2019 Elphel, Inc.
**
** -----------------------------------------------------------------------------**
**
** LwirCamera.java is free software: you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
** the Free Software Foundation, either version 3 of the License, or
** (at your option) any later version.
**
** This program is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
**
** You should have received a copy of the GNU General Public License
** along with this program. If not, see <http://www.gnu.org/licenses/>.
** -----------------------------------------------------------------------------**
**
*/
public class LwirCamera {
}
......@@ -40,6 +40,7 @@ import java.util.EnumSet;
import java.util.List;
import java.util.Properties;
import com.elphel.imagej.cameras.EyesisCorrectionParameters;
import com.elphel.imagej.common.DoubleGaussianBlur;
import com.elphel.imagej.common.ShowDoubleFloatArrays;
import com.elphel.imagej.jp4.JP46_Reader_camera;
......
......@@ -29,6 +29,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.concurrent.atomic.AtomicInteger;
import com.elphel.imagej.cameras.EyesisCorrectionParameters;
import com.elphel.imagej.common.ShowDoubleFloatArrays;
......
package com.elphel.imagej.dp;
import com.elphel.imagej.common.PolynomialApproximation;
/**
** MeasuredLayer - per-tile measured disparity/strength pairs,
** multiple layers can be used for 4-disparity and 2 (hor/vert) pairs
......
......@@ -29,6 +29,8 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.concurrent.atomic.AtomicInteger;
import com.elphel.imagej.cameras.EyesisCorrectionParameters;
import com.elphel.imagej.common.PolynomialApproximation;
import com.elphel.imagej.common.ShowDoubleFloatArrays;
......
......@@ -40,6 +40,7 @@ import com.elphel.imagej.calibration.PixelMapping;
import com.elphel.imagej.common.DoubleFHT;
import com.elphel.imagej.common.DoubleGaussianBlur;
import com.elphel.imagej.common.ShowDoubleFloatArrays;
import com.elphel.imagej.common.WindowTools;
import com.elphel.imagej.jp4.JP46_Reader_camera;
//import javax.swing.SwingUtilities;
......
......@@ -41,6 +41,7 @@ import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
import com.elphel.imagej.calibration.PixelMapping;
import com.elphel.imagej.cameras.EyesisCorrectionParameters;
import com.elphel.imagej.common.DoubleGaussianBlur;
import com.elphel.imagej.common.ShowDoubleFloatArrays;
import com.elphel.imagej.jp4.JP46_Reader_camera;
......
......@@ -27,6 +27,7 @@ import java.util.HashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import com.elphel.imagej.cameras.EyesisCorrectionParameters;
import com.elphel.imagej.common.DoubleGaussianBlur;
import com.elphel.imagej.common.ShowDoubleFloatArrays;
......
......@@ -31,7 +31,9 @@ import java.util.Comparator;
//import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicInteger;
import com.elphel.imagej.cameras.EyesisCorrectionParameters;
import com.elphel.imagej.common.DoubleGaussianBlur;
import com.elphel.imagej.common.PolynomialApproximation;
import com.elphel.imagej.common.ShowDoubleFloatArrays;
public class TileProcessor {
......
......@@ -40,6 +40,7 @@ import java.util.ArrayList;
import java.util.Properties;
import java.util.Random;
import com.elphel.imagej.cameras.EyesisCorrectionParameters;
import com.elphel.imagej.common.GenericJTabbedDialog;
import com.elphel.imagej.common.ShowDoubleFloatArrays;
import com.elphel.imagej.jp4.JP46_Reader_camera;
......
......@@ -30,11 +30,11 @@ import java.util.ArrayList;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import com.elphel.imagej.cameras.EyesisCorrectionParameters;
import com.elphel.imagej.cameras.EyesisCorrectionParameters.CLTParameters;
import com.elphel.imagej.cameras.EyesisCorrectionParameters.CorrectionParameters;
import com.elphel.imagej.dp.CLTPass3d;
import com.elphel.imagej.dp.EyesisCorrectionParameters;
import com.elphel.imagej.dp.GeometryCorrection;
import com.elphel.imagej.dp.EyesisCorrectionParameters.CLTParameters;
import com.elphel.imagej.dp.EyesisCorrectionParameters.CorrectionParameters;
import ij.Prefs;
......
......@@ -44,11 +44,11 @@ import javax.xml.transform.stream.StreamResult;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import com.elphel.imagej.cameras.EyesisCorrectionParameters;
import com.elphel.imagej.cameras.EyesisCorrectionParameters.CLTParameters;
import com.elphel.imagej.cameras.EyesisCorrectionParameters.CorrectionParameters;
import com.elphel.imagej.dp.CLTPass3d;
import com.elphel.imagej.dp.EyesisCorrectionParameters;
import com.elphel.imagej.dp.GeometryCorrection;
import com.elphel.imagej.dp.EyesisCorrectionParameters.CLTParameters;
import com.elphel.imagej.dp.EyesisCorrectionParameters.CorrectionParameters;
// Will use 1m units
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment