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

Started refactoring to get rid of default package

parent 6f3a4fba
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
import java.util.Properties; import java.util.Properties;
import com.elphel.imagej.common.GenericJTabbedDialog;
public class BiQuadParameters { public class BiQuadParameters {
public boolean rig_mode_debug = true; 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 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
...@@ -254,7 +256,7 @@ public class BiQuadParameters { ...@@ -254,7 +256,7 @@ public class BiQuadParameters {
public boolean ml_randomize = true; // randomize offset within 1 step (reduces ml_sweep_steps by 1) public boolean ml_randomize = true; // randomize offset within 1 step (reduces ml_sweep_steps by 1)
// enhancing main camera dsi for generation of the ml files // enhancing main camera dsi for generation of the ml files
public double ml_rig_tolerance = 2.0; // replace main camera disparity if it differs from rig by more than this public double ml_rig_tolerance = 2.0; // replace main camera disparity if it differs from rig by more than this
public double ml_rnd_offset = 0.5; // add random offset to rig disparity if there is no suitable data from main camera neighbors public double ml_rnd_offset = 0.5; // add random offset to rig disparity if there is no suitable data from main camera neighbors
public double ml_main_tolerance = 1.0; // look for neighbors within this disparity difference from the rig disparity public double ml_main_tolerance = 1.0; // look for neighbors within this disparity difference from the rig disparity
public int ml_grow_steps = 2; // measure correlation for the tiles in the undefined areas around known (to match 5x5 clusters public int ml_grow_steps = 2; // measure correlation for the tiles in the undefined areas around known (to match 5x5 clusters
...@@ -264,7 +266,7 @@ public class BiQuadParameters { ...@@ -264,7 +266,7 @@ public class BiQuadParameters {
public boolean ml_main = true; // generate ML from main camera DSI public boolean ml_main = true; // generate ML from main camera DSI
public boolean ml_main_rnd = true; // generate ML from main camera DSI with random offset public boolean ml_main_rnd = true; // generate ML from main camera DSI with random offset
public boolean ml_rig_rnd = true; // generate ML from rig DSI (GT) with random offset public boolean ml_rig_rnd = true; // generate ML from rig DSI (GT) with random offset
public boolean ml_keep_aux = false; // true; // include auxiliary camera data in the ML output public boolean ml_keep_aux = false; // true; // include auxiliary camera data in the ML output
public boolean ml_keep_inter = false; // true; // include inter-camera correlation data in the ML output public boolean ml_keep_inter = false; // true; // include inter-camera correlation data in the ML output
public boolean ml_keep_hor_vert = true; // include combined horizontal and vertical pairs data in the ML output public boolean ml_keep_hor_vert = true; // include combined horizontal and vertical pairs data in the ML output
...@@ -674,7 +676,7 @@ public class BiQuadParameters { ...@@ -674,7 +676,7 @@ public class BiQuadParameters {
gd.addCheckbox ("Randomize offset", this.ml_randomize, gd.addCheckbox ("Randomize offset", this.ml_randomize,
"Each tile will have individual offset, but it the range between the filename and next higher. Reduces sweep steps by 1"); "Each tile will have individual offset, but it the range between the filename and next higher. Reduces sweep steps by 1");
gd.addMessage("Enhancing main camera dsi for generation of the ml files"); gd.addMessage("Enhancing main camera dsi for generation of the ml files");
gd.addNumericField("Max disparity difference between rig and main camera", this.ml_rig_tolerance, 3,6,"", gd.addNumericField("Max disparity difference between rig and main camera", this.ml_rig_tolerance, 3,6,"",
...@@ -689,15 +691,15 @@ public class BiQuadParameters { ...@@ -689,15 +691,15 @@ public class BiQuadParameters {
"-1 - prefer background, 0 - use average. 1 - prefer foreground"); "-1 - prefer background, 0 - use average. 1 - prefer foreground");
gd.addNumericField("Extrapolated tile strength", this.ml_new_strength, 3,6,"", gd.addNumericField("Extrapolated tile strength", this.ml_new_strength, 3,6,"",
"Assign this fraction of average neighbors strength strength to the tiles where strength is unknown (expanded tiles with extrapolated target)"); "Assign this fraction of average neighbors strength strength to the tiles where strength is unknown (expanded tiles with extrapolated target)");
gd.addCheckbox ("Generate ML 2d correlations from main camera DSI", this.ml_main, gd.addCheckbox ("Generate ML 2d correlations from main camera DSI", this.ml_main,
"Target disparity/convergence extracted from the main camera DSI, filtered and expanded"); "Target disparity/convergence extracted from the main camera DSI, filtered and expanded");
gd.addCheckbox ("Generate ML from main camera DSI with random offset", this.ml_main_rnd, gd.addCheckbox ("Generate ML from main camera DSI with random offset", this.ml_main_rnd,
"Same as above, random offset is added to the target disparity/convergence"); "Same as above, random offset is added to the target disparity/convergence");
gd.addCheckbox ("Generate ML from rig DSI (GT) with random offset", this.ml_rig_rnd, gd.addCheckbox ("Generate ML from rig DSI (GT) with random offset", this.ml_rig_rnd,
"Main camera data is not used, offset is just random from the rig (ground truth)"); "Main camera data is not used, offset is just random from the rig (ground truth)");
gd.addCheckbox ("Include auxiliary camera data in the ML output", this.ml_keep_aux, gd.addCheckbox ("Include auxiliary camera data in the ML output", this.ml_keep_aux,
"ML output will have the second set of the layers for the auxiliary camera. Disparity values should be scaled for the camera baseline"); "ML output will have the second set of the layers for the auxiliary camera. Disparity values should be scaled for the camera baseline");
gd.addCheckbox ("Keep inter-camera correlation data", this.ml_keep_inter, gd.addCheckbox ("Keep inter-camera correlation data", this.ml_keep_inter,
...@@ -917,18 +919,18 @@ public class BiQuadParameters { ...@@ -917,18 +919,18 @@ public class BiQuadParameters {
this.ml_disparity_sweep= gd.getNextNumber(); this.ml_disparity_sweep= gd.getNextNumber();
this.ml_sweep_steps= (int) gd.getNextNumber(); this.ml_sweep_steps= (int) gd.getNextNumber();
this.ml_randomize= gd.getNextBoolean(); this.ml_randomize= gd.getNextBoolean();
this.ml_rig_tolerance= gd.getNextNumber(); this.ml_rig_tolerance= gd.getNextNumber();
this.ml_rnd_offset= gd.getNextNumber(); this.ml_rnd_offset= gd.getNextNumber();
this.ml_main_tolerance= gd.getNextNumber(); this.ml_main_tolerance= gd.getNextNumber();
this.ml_grow_steps= (int) gd.getNextNumber(); this.ml_grow_steps= (int) gd.getNextNumber();
this.ml_grow_mode= (int) gd.getNextNumber(); this.ml_grow_mode= (int) gd.getNextNumber();
this.ml_new_strength= gd.getNextNumber(); this.ml_new_strength= gd.getNextNumber();
this.ml_main= gd.getNextBoolean(); this.ml_main= gd.getNextBoolean();
this.ml_main_rnd= gd.getNextBoolean(); this.ml_main_rnd= gd.getNextBoolean();
this.ml_rig_rnd= gd.getNextBoolean(); this.ml_rig_rnd= gd.getNextBoolean();
this.ml_keep_aux= gd.getNextBoolean(); this.ml_keep_aux= gd.getNextBoolean();
this.ml_keep_inter= gd.getNextBoolean(); this.ml_keep_inter= gd.getNextBoolean();
this.ml_keep_tbrl= gd.getNextBoolean(); this.ml_keep_tbrl= gd.getNextBoolean();
...@@ -1140,18 +1142,18 @@ public class BiQuadParameters { ...@@ -1140,18 +1142,18 @@ public class BiQuadParameters {
properties.setProperty(prefix+"ml_disparity_sweep", this.ml_disparity_sweep+""); properties.setProperty(prefix+"ml_disparity_sweep", this.ml_disparity_sweep+"");
properties.setProperty(prefix+"ml_sweep_steps", this.ml_sweep_steps+""); properties.setProperty(prefix+"ml_sweep_steps", this.ml_sweep_steps+"");
properties.setProperty(prefix+"ml_randomize", this.ml_randomize+""); properties.setProperty(prefix+"ml_randomize", this.ml_randomize+"");
properties.setProperty(prefix+"ml_rig_tolerance", this.ml_rig_tolerance+""); properties.setProperty(prefix+"ml_rig_tolerance", this.ml_rig_tolerance+"");
properties.setProperty(prefix+"ml_rnd_offset", this.ml_rnd_offset+""); properties.setProperty(prefix+"ml_rnd_offset", this.ml_rnd_offset+"");
properties.setProperty(prefix+"ml_main_tolerance", this.ml_main_tolerance+""); properties.setProperty(prefix+"ml_main_tolerance", this.ml_main_tolerance+"");
properties.setProperty(prefix+"ml_grow_steps", this.ml_grow_steps+""); properties.setProperty(prefix+"ml_grow_steps", this.ml_grow_steps+"");
properties.setProperty(prefix+"ml_grow_mode", this.ml_grow_mode+""); properties.setProperty(prefix+"ml_grow_mode", this.ml_grow_mode+"");
properties.setProperty(prefix+"ml_new_strength", this.ml_new_strength+""); properties.setProperty(prefix+"ml_new_strength", this.ml_new_strength+"");
properties.setProperty(prefix+"ml_main", this.ml_main+""); properties.setProperty(prefix+"ml_main", this.ml_main+"");
properties.setProperty(prefix+"ml_main_rnd", this.ml_main_rnd+""); properties.setProperty(prefix+"ml_main_rnd", this.ml_main_rnd+"");
properties.setProperty(prefix+"ml_rig_rnd", this.ml_rig_rnd+""); properties.setProperty(prefix+"ml_rig_rnd", this.ml_rig_rnd+"");
properties.setProperty(prefix+"ml_keep_aux", this.ml_keep_aux+""); properties.setProperty(prefix+"ml_keep_aux", this.ml_keep_aux+"");
properties.setProperty(prefix+"ml_keep_inter", this.ml_keep_inter+""); properties.setProperty(prefix+"ml_keep_inter", this.ml_keep_inter+"");
properties.setProperty(prefix+"ml_keep_tbrl", this.ml_keep_tbrl+""); properties.setProperty(prefix+"ml_keep_tbrl", this.ml_keep_tbrl+"");
...@@ -1223,8 +1225,8 @@ public class BiQuadParameters { ...@@ -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_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_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_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_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_sigma")); 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_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")); if (properties.getProperty(prefix+"lt_min_new")!=null) this.lt_min_new=Integer.parseInt(properties.getProperty(prefix+"lt_min_new"));
...@@ -1361,8 +1363,8 @@ public class BiQuadParameters { ...@@ -1361,8 +1363,8 @@ public class BiQuadParameters {
if (properties.getProperty(prefix+"ml_sweep_steps")!=null) this.ml_sweep_steps=Integer.parseInt(properties.getProperty(prefix+"ml_sweep_steps")); if (properties.getProperty(prefix+"ml_sweep_steps")!=null) this.ml_sweep_steps=Integer.parseInt(properties.getProperty(prefix+"ml_sweep_steps"));
if (properties.getProperty(prefix+"ml_randomize")!=null) this.ml_randomize=Boolean.parseBoolean(properties.getProperty(prefix+"ml_randomize")); if (properties.getProperty(prefix+"ml_randomize")!=null) this.ml_randomize=Boolean.parseBoolean(properties.getProperty(prefix+"ml_randomize"));
if (properties.getProperty(prefix+"ml_rig_tolerance")!=null) this.ml_rig_tolerance=Double.parseDouble(properties.getProperty(prefix+"ml_rig_tolerance")); if (properties.getProperty(prefix+"ml_rig_tolerance")!=null) this.ml_rig_tolerance=Double.parseDouble(properties.getProperty(prefix+"ml_rig_tolerance"));
if (properties.getProperty(prefix+"ml_rnd_offset")!=null) this.ml_rnd_offset=Double.parseDouble(properties.getProperty(prefix+"ml_rnd_offset")); if (properties.getProperty(prefix+"ml_rnd_offset")!=null) this.ml_rnd_offset=Double.parseDouble(properties.getProperty(prefix+"ml_rnd_offset"));
if (properties.getProperty(prefix+"ml_main_tolerance")!=null) this.ml_main_tolerance=Double.parseDouble(properties.getProperty(prefix+"ml_main_tolerance")); if (properties.getProperty(prefix+"ml_main_tolerance")!=null) this.ml_main_tolerance=Double.parseDouble(properties.getProperty(prefix+"ml_main_tolerance"));
...@@ -1373,7 +1375,7 @@ public class BiQuadParameters { ...@@ -1373,7 +1375,7 @@ public class BiQuadParameters {
if (properties.getProperty(prefix+"ml_main")!=null) this.ml_main=Boolean.parseBoolean(properties.getProperty(prefix+"ml_main")); if (properties.getProperty(prefix+"ml_main")!=null) this.ml_main=Boolean.parseBoolean(properties.getProperty(prefix+"ml_main"));
if (properties.getProperty(prefix+"ml_main_rnd")!=null) this.ml_main_rnd=Boolean.parseBoolean(properties.getProperty(prefix+"ml_main_rnd")); if (properties.getProperty(prefix+"ml_main_rnd")!=null) this.ml_main_rnd=Boolean.parseBoolean(properties.getProperty(prefix+"ml_main_rnd"));
if (properties.getProperty(prefix+"ml_rig_rnd")!=null) this.ml_rig_rnd=Boolean.parseBoolean(properties.getProperty(prefix+"ml_rig_rnd")); if (properties.getProperty(prefix+"ml_rig_rnd")!=null) this.ml_rig_rnd=Boolean.parseBoolean(properties.getProperty(prefix+"ml_rig_rnd"));
if (properties.getProperty(prefix+"ml_keep_aux")!=null) this.ml_keep_aux=Boolean.parseBoolean(properties.getProperty(prefix+"ml_keep_aux")); if (properties.getProperty(prefix+"ml_keep_aux")!=null) this.ml_keep_aux=Boolean.parseBoolean(properties.getProperty(prefix+"ml_keep_aux"));
if (properties.getProperty(prefix+"ml_keep_inter")!=null) this.ml_keep_inter=Boolean.parseBoolean(properties.getProperty(prefix+"ml_keep_inter")); if (properties.getProperty(prefix+"ml_keep_inter")!=null) this.ml_keep_inter=Boolean.parseBoolean(properties.getProperty(prefix+"ml_keep_inter"));
if (properties.getProperty(prefix+"ml_keep_tbrl")!=null) this.ml_keep_tbrl=Boolean.parseBoolean(properties.getProperty(prefix+"ml_keep_tbrl")); if (properties.getProperty(prefix+"ml_keep_tbrl")!=null) this.ml_keep_tbrl=Boolean.parseBoolean(properties.getProperty(prefix+"ml_keep_tbrl"));
...@@ -1582,21 +1584,21 @@ public class BiQuadParameters { ...@@ -1582,21 +1584,21 @@ public class BiQuadParameters {
bqp.ml_hwidth= this.ml_hwidth; bqp.ml_hwidth= this.ml_hwidth;
bqp.ml_disparity_sweep= this.ml_disparity_sweep; bqp.ml_disparity_sweep= this.ml_disparity_sweep;
bqp.ml_sweep_steps= this.ml_sweep_steps; bqp.ml_sweep_steps= this.ml_sweep_steps;
bqp.ml_main = this.ml_main; bqp.ml_main = this.ml_main;
bqp.ml_main_rnd = this.ml_main_rnd; bqp.ml_main_rnd = this.ml_main_rnd;
bqp.ml_rig_rnd = this.ml_rig_rnd; bqp.ml_rig_rnd = this.ml_rig_rnd;
bqp.ml_keep_aux= this.ml_keep_aux; bqp.ml_keep_aux= this.ml_keep_aux;
bqp.ml_randomize = this.ml_randomize; bqp.ml_randomize = this.ml_randomize;
bqp.ml_rig_tolerance= this.ml_rig_tolerance; bqp.ml_rig_tolerance= this.ml_rig_tolerance;
bqp.ml_rnd_offset= this.ml_rnd_offset; bqp.ml_rnd_offset= this.ml_rnd_offset;
bqp.ml_main_tolerance= this.ml_main_tolerance; bqp.ml_main_tolerance= this.ml_main_tolerance;
bqp.ml_grow_steps= this.ml_grow_steps; bqp.ml_grow_steps= this.ml_grow_steps;
bqp.ml_grow_mode= this.ml_grow_mode; bqp.ml_grow_mode= this.ml_grow_mode;
bqp.ml_new_strength= this.ml_new_strength; bqp.ml_new_strength= this.ml_new_strength;
bqp.ml_keep_inter= this.ml_keep_inter; bqp.ml_keep_inter= this.ml_keep_inter;
bqp.ml_keep_tbrl= this.ml_keep_tbrl; bqp.ml_keep_tbrl= this.ml_keep_tbrl;
bqp.ml_keep_hor_vert= this.ml_keep_hor_vert; bqp.ml_keep_hor_vert= this.ml_keep_hor_vert;
......
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
import java.util.Properties; import java.util.Properties;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import com.elphel.imagej.common.GenericJTabbedDialog;
import ij.ImageStack; import ij.ImageStack;
import ij.gui.GenericDialog; import ij.gui.GenericDialog;
......
...@@ -33,6 +33,8 @@ import java.util.HashMap; ...@@ -33,6 +33,8 @@ import java.util.HashMap;
import java.util.Properties; import java.util.Properties;
import java.util.Set; import java.util.Set;
import com.elphel.imagej.common.GenericJTabbedDialog;
import ij.IJ; import ij.IJ;
import ij.Prefs; import ij.Prefs;
import ij.gui.GenericDialog; import ij.gui.GenericDialog;
......
...@@ -70,6 +70,7 @@ import java.util.concurrent.atomic.AtomicInteger; ...@@ -70,6 +70,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import javax.swing.JFileChooser; import javax.swing.JFileChooser;
import javax.swing.filechooser.FileFilter; import javax.swing.filechooser.FileFilter;
import com.elphel.imagej.common.GenericJTabbedDialog;
import com.elphel.imagej.lwir.LwirReader; import com.elphel.imagej.lwir.LwirReader;
import ij.CompositeImage; import ij.CompositeImage;
...@@ -159,6 +160,7 @@ private Panel panel1, ...@@ -159,6 +160,7 @@ private Panel panel1,
public static QuadCLT QUAD_CLT_AUX = null; public static QuadCLT QUAD_CLT_AUX = null;
public static TwoQuadCLT TWO_QUAD_CLT = null; public static TwoQuadCLT TWO_QUAD_CLT = null;
public static GPUTileProcessor GPU_TILE_PROCESSOR = null; public static GPUTileProcessor GPU_TILE_PROCESSOR = null;
public static LwirReader LWIR_READER = null;
public static EyesisCorrectionParameters.DebayerParameters DEBAYER_PARAMETERS = new EyesisCorrectionParameters.DebayerParameters( public static EyesisCorrectionParameters.DebayerParameters DEBAYER_PARAMETERS = new EyesisCorrectionParameters.DebayerParameters(
64, // size //128; 64, // size //128;
...@@ -4805,9 +4807,12 @@ private Panel panel1, ...@@ -4805,9 +4807,12 @@ private Panel panel1,
/* ======================================================================== */ /* ======================================================================== */
} else if (label.equals("LWIR_ACQUIRE")) { } else if (label.equals("LWIR_ACQUIRE")) {
DEBUG_LEVEL=MASTER_DEBUG_LEVEL; DEBUG_LEVEL=MASTER_DEBUG_LEVEL;
loci.common.DebugTools.enableLogging("ERROR"); // INFO"); // ERROR"); loci.common.DebugTools.enableLogging((DEBUG_LEVEL > 1)?"DEBUG":((DEBUG_LEVEL > 0)?"INFO":"ERROR")); // INFO"); // ERROR");
LwirReader lwirReader = new LwirReader(); // public static LwirReader LWIR_READER = null;
ImagePlus [][] imps = lwirReader.readAllMultiple( if (LWIR_READER == null) {
LWIR_READER = new LwirReader();
}
ImagePlus [][] imps = LWIR_READER.readAllMultiple(
10, // final int num_frames, 10, // final int num_frames,
true, // final boolean show, true, // final boolean show,
false); // true); // final boolean scale) false); // true); // final boolean scale)
...@@ -4816,15 +4821,14 @@ private Panel panel1, ...@@ -4816,15 +4821,14 @@ private Panel panel1,
} }
System.out.println("LWIR_ACQUIRE: got "+imps.length+" image sets"); 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) { if (imps_sync != null) {
ImagePlus [] imps_avg = lwirReader.averageMultiFrames(imps_sync); ImagePlus [] imps_avg = LWIR_READER.averageMultiFrames(imps_sync);
for (ImagePlus imp: imps_avg) { for (ImagePlus imp: imps_avg) {
imp.show(); imp.show();
} }
} }
//JTabbedTest //JTabbedTest
// End of buttons code // End of buttons code
} }
......
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Properties; import java.util.Properties;
import com.elphel.imagej.common.GenericJTabbedDialog;
import Jama.Matrix; import Jama.Matrix;
import ij.IJ; import ij.IJ;
......
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
import java.util.Properties; import java.util.Properties;
import com.elphel.imagej.common.GenericJTabbedDialog;
public class ImageDttParameters { public class ImageDttParameters {
public boolean corr_mode_debug = true; public boolean corr_mode_debug = true;
public boolean mix_corr_poly = true; public boolean mix_corr_poly = true;
......
import java.util.Properties; import java.util.Properties;
import com.elphel.imagej.common.GenericJTabbedDialog;
/** /**
** **
** PoleProcessorParameters - parameters for PoleProcessor class that identifies ** PoleProcessorParameters - parameters for PoleProcessor class that identifies
......
...@@ -39,6 +39,8 @@ import java.util.ArrayList; ...@@ -39,6 +39,8 @@ import java.util.ArrayList;
import java.util.Properties; import java.util.Properties;
import java.util.Random; import java.util.Random;
import com.elphel.imagej.common.GenericJTabbedDialog;
import ij.IJ; import ij.IJ;
import ij.ImagePlus; import ij.ImagePlus;
import ij.ImageStack; import ij.ImageStack;
......
package com.elphel.imagej.common;
/* /*
* TabbedPaneDemo.java requires one additional file: * TabbedPaneDemo.java requires one additional file:
* images/middle.gif. * images/middle.gif.
......
/**
*
*/
/**
* @author Andrey Filippov
*
*/
package com.elphel.imagej.common;
\ No newline at end of file
...@@ -32,7 +32,6 @@ import java.util.Properties; ...@@ -32,7 +32,6 @@ import java.util.Properties;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import com.elphel.imagej.readers.ElphelTiffReader;
import com.elphel.imagej.readers.ImagejJp4TiffMulti; import com.elphel.imagej.readers.ImagejJp4TiffMulti;
import ij.ImagePlus; import ij.ImagePlus;
...@@ -51,10 +50,6 @@ public class LwirReader { ...@@ -51,10 +50,6 @@ public class LwirReader {
"http://192.168.0.38:2325/bchn4", "http://192.168.0.38:2325/bchn4",
"http://192.168.0.38:2326/bchn4", "http://192.168.0.38:2326/bchn4",
}; };
// public static String IMAGE_URL_FIRST="/towp/wait/img/next/save";
// public static String IMAGE_URL_NEXT= "/torp/wait/img/next/save";
// public static String IMAGE_URL_FIRST="/towp/wait/img/save"; // next image name, same image number/time
// public static String IMAGE_URL_NEXT= "/torp/wait/img/save"; // same image name, same image number/time
public static String IMAGE_URL_FIRST="/towp/wait/img/save"; // next image name, same image number/time public static String IMAGE_URL_FIRST="/towp/wait/img/save"; // next image name, same image number/time
public static String IMAGE_URL_NEXT= "/torp/next/wait/img/save"; // same image name, same image number/time public static String IMAGE_URL_NEXT= "/torp/next/wait/img/save"; // same image name, same image number/time
...@@ -64,10 +59,14 @@ public class LwirReader { ...@@ -64,10 +59,14 @@ public class LwirReader {
/** Logger for this class. */ /** Logger for this class. */
private static final Logger LOGGER = private static final Logger LOGGER =
LoggerFactory.getLogger(ElphelTiffReader.class); LoggerFactory.getLogger(LwirReader.class);
private ImagejJp4TiffMulti imagejJp4TiffMulti; private ImagejJp4TiffMulti imagejJp4TiffMulti;
public LwirReader() { public LwirReader() {
imagejJp4TiffMulti = null; imagejJp4TiffMulti = null;
} }
...@@ -103,7 +102,7 @@ public class LwirReader { ...@@ -103,7 +102,7 @@ public class LwirReader {
} catch (FormatException e) { } catch (FormatException e) {
LOGGER.error("readAllMultiple0:FormatException, priming"); LOGGER.error("readAllMultiple0:FormatException, priming");
} }
LOGGER.error("priming..."+(i+1)); LOGGER.info("priming..."+(i+1));
try { try {
Thread.sleep(1000); Thread.sleep(1000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
...@@ -113,7 +112,7 @@ public class LwirReader { ...@@ -113,7 +112,7 @@ public class LwirReader {
} }
} }
for (int n = 0; n < num_frames; n++) { for (int n = 0; n < num_frames; n++) {
LOGGER.error("---- Acquiring frame set "+n); LOGGER.info("---- Acquiring frame set "+n);
try { try {
imagejJp4TiffMulti.getMultiImages( (n==0)? urls0:urls1, imps[n], scale, std); imagejJp4TiffMulti.getMultiImages( (n==0)? urls0:urls1, imps[n], scale, std);
} catch (IOException e) { } catch (IOException e) {
...@@ -141,7 +140,7 @@ public class LwirReader { ...@@ -141,7 +140,7 @@ public class LwirReader {
img_numbers[n][i] = -1; img_numbers[n][i] = -1;
} }
img_names[n][i] = (String) imps[n][i].getProperty("CONTENT_FILENAME"); img_names[n][i] = (String) imps[n][i].getProperty("CONTENT_FILENAME");
LOGGER.error("Seconds for" + n+":"+i+" - "+img_seconds[n][i]+", number"+img_numbers[n][i]+", name "+img_names[n][i]); LOGGER.info("Seconds for" + n+":"+i+" - "+img_seconds[n][i]+", number"+img_numbers[n][i]+", name "+img_names[n][i]);
} }
} }
...@@ -251,7 +250,7 @@ public class LwirReader { ...@@ -251,7 +250,7 @@ public class LwirReader {
} }
for (int i = 0; i < num_channels; i++) { for (int i = 0; i < num_channels; i++) {
// change to info later: // change to info later:
LOGGER.error("Channel "+ i+" frame offset="+frame_offsets[i]+ ", time offset = "+time_offsets[i]+" sec"); LOGGER.info("Channel "+ i+" frame offset="+frame_offsets[i]+ ", time offset = "+time_offsets[i]+" sec");
} }
ImagePlus [][] imps_synced = new ImagePlus [num_frames - fr_max + fr_min][num_channels]; ImagePlus [][] imps_synced = new ImagePlus [num_frames - fr_max + fr_min][num_channels];
for (int n = 0; n < imps_synced.length; n++) { for (int n = 0; n < imps_synced.length; n++) {
......
###
# #%L
# Common package for I/O and related utilities
# %%
# Copyright (C) 2005 - 2016 Open Microscopy Environment:
# - Board of Regents of the University of Wisconsin-Madison
# - Glencoe Software, Inc.
# - University of Dundee
# %%
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1. Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
# #L%
###
#
# NOTE: All service classes must be fully qualified
#
## ClassNotFoundException: loci.formats.services.JPEGXRService
## ClassNotFoundException: loci.formats.services.JHDFService
# OME-XML service (interface and implementation in bio-formats component)
loci.formats.services.OMEXMLService=loci.formats.services.OMEXMLServiceImpl
# POI service (interface and implementation in bio-formats component)
###loci.formats.services.POIService=loci.formats.services.POIServiceImpl
# NetCDF service (interface and implementation in bio-formats component)
###loci.formats.services.NetCDFService=loci.formats.services.NetCDFServiceImpl
# JHDF service (interface and implementation in bio-formats component)
## loci.formats.services.JHDFService=loci.formats.services.JHDFServiceImpl # ClassNotFoundException
# MDB Tools service (interface and implementation in bio-formats component)
###loci.formats.services.MDBService=loci.formats.services.MDBServiceImpl
# JAI Image I/O service (interface and implementation in bio-formats component)
###loci.formats.services.JAIIIOService=loci.formats.services.JAIIIOServiceImpl
# LuraWave decoder service (interface and implementation in bio-formats
# component; depends on stubs.jar for compilation)
###loci.formats.services.LuraWaveService=loci.formats.services.LuraWaveServiceImpl
# Metakit reader service (interface and implementation in bio-formats component;
# depends upon metakit.jar for compilation)
###loci.formats.services.MetakitService=loci.formats.services.MetakitServiceImpl
# libjpeg-turbo service
###loci.formats.services.JPEGTurboService=loci.formats.services.JPEGTurboServiceImpl
# Woolz service (interface and implementation in bio-formats)
###loci.formats.services.WlzService=loci.formats.services.WlzServiceImpl
loci.formats.services.EXIFService=loci.formats.services.EXIFServiceImpl
## loci.formats.services.JPEGXRService=loci.formats.services.JPEGXRServiceImpl # ClassNotFoundException
# Minio S3 client service
###loci.common.services.S3ClientService=loci.common.services.S3ClientServiceImpl
# OME Codecs JAI Image I/O service
###ome.codecs.services.JAIIIOService=ome.codecs.services.JAIIIOServiceImpl
# OME Codecs LuraWave decoder service (depends on stubs.jar for compilation)
###ome.codecs.services.LuraWaveService=ome.codecs.services.LuraWaveServiceImpl
###
# #%L
# Common package for I/O and related utilities
# %%
# Copyright (C) 2005 - 2016 Open Microscopy Environment:
# - Board of Regents of the University of Wisconsin-Madison
# - Glencoe Software, Inc.
# - University of Dundee
# %%
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1. Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
# #L%
###
#
# NOTE: All service classes must be fully qualified
#
## ClassNotFoundException: loci.formats.services.JPEGXRService
## ClassNotFoundException: loci.formats.services.JHDFService
# OME-XML service (interface and implementation in bio-formats component)
loci.formats.services.OMEXMLService=loci.formats.services.OMEXMLServiceImpl
# POI service (interface and implementation in bio-formats component)
loci.formats.services.POIService=loci.formats.services.POIServiceImpl
# NetCDF service (interface and implementation in bio-formats component)
loci.formats.services.NetCDFService=loci.formats.services.NetCDFServiceImpl
# JHDF service (interface and implementation in bio-formats component)
## loci.formats.services.JHDFService=loci.formats.services.JHDFServiceImpl # ClassNotFoundException
# MDB Tools service (interface and implementation in bio-formats component)
loci.formats.services.MDBService=loci.formats.services.MDBServiceImpl
# JAI Image I/O service (interface and implementation in bio-formats component)
loci.formats.services.JAIIIOService=loci.formats.services.JAIIIOServiceImpl
# LuraWave decoder service (interface and implementation in bio-formats
# component; depends on stubs.jar for compilation)
loci.formats.services.LuraWaveService=loci.formats.services.LuraWaveServiceImpl
# Metakit reader service (interface and implementation in bio-formats component;
# depends upon metakit.jar for compilation)
loci.formats.services.MetakitService=loci.formats.services.MetakitServiceImpl
# libjpeg-turbo service
loci.formats.services.JPEGTurboService=loci.formats.services.JPEGTurboServiceImpl
# Woolz service (interface and implementation in bio-formats)
loci.formats.services.WlzService=loci.formats.services.WlzServiceImpl
loci.formats.services.EXIFService=loci.formats.services.EXIFServiceImpl
## loci.formats.services.JPEGXRService=loci.formats.services.JPEGXRServiceImpl # ClassNotFoundException
# Minio S3 client service
loci.common.services.S3ClientService=loci.common.services.S3ClientServiceImpl
# OME Codecs JAI Image I/O service
ome.codecs.services.JAIIIOService=ome.codecs.services.JAIIIOServiceImpl
# OME Codecs LuraWave decoder service (depends on stubs.jar for compilation)
ome.codecs.services.LuraWaveService=ome.codecs.services.LuraWaveServiceImpl
###
# #%L
# Common package for I/O and related utilities
# %%
# Copyright (C) 2005 - 2016 Open Microscopy Environment:
# - Board of Regents of the University of Wisconsin-Madison
# - Glencoe Software, Inc.
# - University of Dundee
# %%
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1. Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
# #L%
###
#
# NOTE: All service classes must be fully qualified
#
## ClassNotFoundException: loci.formats.services.JPEGXRService
## ClassNotFoundException: loci.formats.services.JHDFService
# OME-XML service (interface and implementation in bio-formats component)
loci.formats.services.OMEXMLService=loci.formats.services.OMEXMLServiceImpl
# POI service (interface and implementation in bio-formats component)
###loci.formats.services.POIService=loci.formats.services.POIServiceImpl
# NetCDF service (interface and implementation in bio-formats component)
###loci.formats.services.NetCDFService=loci.formats.services.NetCDFServiceImpl
# JHDF service (interface and implementation in bio-formats component)
## loci.formats.services.JHDFService=loci.formats.services.JHDFServiceImpl # ClassNotFoundException
# MDB Tools service (interface and implementation in bio-formats component)
###loci.formats.services.MDBService=loci.formats.services.MDBServiceImpl
# JAI Image I/O service (interface and implementation in bio-formats component)
###loci.formats.services.JAIIIOService=loci.formats.services.JAIIIOServiceImpl
# LuraWave decoder service (interface and implementation in bio-formats
# component; depends on stubs.jar for compilation)
###loci.formats.services.LuraWaveService=loci.formats.services.LuraWaveServiceImpl
# Metakit reader service (interface and implementation in bio-formats component;
# depends upon metakit.jar for compilation)
###loci.formats.services.MetakitService=loci.formats.services.MetakitServiceImpl
# libjpeg-turbo service
###loci.formats.services.JPEGTurboService=loci.formats.services.JPEGTurboServiceImpl
# Woolz service (interface and implementation in bio-formats)
###loci.formats.services.WlzService=loci.formats.services.WlzServiceImpl
loci.formats.services.EXIFService=loci.formats.services.EXIFServiceImpl
## loci.formats.services.JPEGXRService=loci.formats.services.JPEGXRServiceImpl # ClassNotFoundException
# Minio S3 client service
###loci.common.services.S3ClientService=loci.common.services.S3ClientServiceImpl
# OME Codecs JAI Image I/O service
###ome.codecs.services.JAIIIOService=ome.codecs.services.JAIIIOServiceImpl
# OME Codecs LuraWave decoder service (depends on stubs.jar for compilation)
###ome.codecs.services.LuraWaveService=ome.codecs.services.LuraWaveServiceImpl
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