Skip to content

I
imagej-elphel
Commit 8550fc6e authored by Andrey Filippov's avatar Andrey Filippov
Browse files
Options

Update generation of TIFF sequence subtracting new averages from the CLT

parent 81ca6c68
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 187 additions and 74 deletions
src/main/java/com/elphel/imagej/tileprocessor/IntersceneMatchParameters.java
View file @ 8550fc6e
......@@ -737,6 +737,7 @@ min_str_neib_fpn 0.35
public boolean um_mono = true; // applies to both TIFF and AVI
public double um_sigma = 10;
public double um_weight = 0.97; //
public boolean um_mono_linear = true; // save linear (no-UM) in addition to UM
public boolean mono_fixed = true; // normalize to fixed range when converting to 8 bits
public double mono_range = 500.0; // monochrome full-scale range (+/- half)
public boolean anaglyth_en = true; // applies to both TIFF and AVI
......@@ -2140,6 +2141,8 @@ min_str_neib_fpn 0.35
"Unsharp mask Gaussian sigma.");
gd.addNumericField("Unsharp mask weight", this.um_weight, 5,7,"",
"Unsharp mask weightt (multiply blurred version before subtraction from the original).");
gd.addCheckbox ("Save linear", this.um_mono_linear,
"Save TIFF sequences without UM in addition to UM");
gd.addCheckbox ("Fixed monochrome range", this.mono_fixed,
"Normalize monochrome (after UM) to a fixed range when converting to 8 bit RGB.");
......@@ -2964,6 +2967,7 @@ min_str_neib_fpn 0.35
this.um_mono = gd.getNextBoolean();
this.um_sigma = gd.getNextNumber();
this.um_weight = gd.getNextNumber();
this.um_mono_linear = gd.getNextBoolean();
this.mono_fixed = gd.getNextBoolean();
this.mono_range = gd.getNextNumber();
......@@ -3783,6 +3787,7 @@ min_str_neib_fpn 0.35
properties.setProperty(prefix+"um_mono", this.um_mono+""); // boolean
properties.setProperty(prefix+"um_sigma", this.um_sigma+""); // double
properties.setProperty(prefix+"um_weight", this.um_weight+""); // double
properties.setProperty(prefix+"um_mono_linear", this.um_mono_linear+""); // boolean
properties.setProperty(prefix+"mono_fixed", this.mono_fixed+""); // boolean
properties.setProperty(prefix+"mono_range", this.mono_range+""); // double
properties.setProperty(prefix+"anaglyth_en", this.anaglyth_en+""); // boolean
......@@ -4584,6 +4589,7 @@ min_str_neib_fpn 0.35
if (properties.getProperty(prefix+"um_mono")!=null) this.um_mono=Boolean.parseBoolean(properties.getProperty(prefix+"um_mono"));
if (properties.getProperty(prefix+"um_sigma")!=null) this.um_sigma=Double.parseDouble(properties.getProperty(prefix+"um_sigma"));
if (properties.getProperty(prefix+"um_weight")!=null) this.um_weight=Double.parseDouble(properties.getProperty(prefix+"um_weight"));
if (properties.getProperty(prefix+"um_mono_linear")!=null) this.um_mono_linear=Boolean.parseBoolean(properties.getProperty(prefix+"um_mono_linear"));
if (properties.getProperty(prefix+"mono_fixed")!=null) this.mono_fixed=Boolean.parseBoolean(properties.getProperty(prefix+"mono_fixed"));
if (properties.getProperty(prefix+"mono_range")!=null) this.mono_range=Double.parseDouble(properties.getProperty(prefix+"mono_range"));
......@@ -5368,35 +5374,36 @@ min_str_neib_fpn 0.35
imp.sensor_mask = this.sensor_mask;
imp.merge_all = this.merge_all;
imp.video_fps = this. video_fps;
imp.sensor_fps = this. sensor_fps;
imp.mode_avi = this. mode_avi;
imp.avi_JPEG_quality = this. avi_JPEG_quality;
imp.run_ffmpeg = this. run_ffmpeg;
imp.video_ext = this. video_ext;
imp.video_codec = this. video_codec;
imp.video_crf = this. video_crf;
imp.remove_avi = this. remove_avi;
imp.video_codec_combo = this. video_codec_combo;
imp.video_crf_combo = this. video_crf_combo;
imp.add_average = this. add_average;
imp.subtract_average = this. subtract_average;
imp.running_average = this. running_average;
imp.video_fps = this.video_fps;
imp.sensor_fps = this.sensor_fps;
imp.mode_avi = this.mode_avi;
imp.avi_JPEG_quality = this.avi_JPEG_quality;
imp.run_ffmpeg = this.run_ffmpeg;
imp.video_ext = this.video_ext;
imp.video_codec = this.video_codec;
imp.video_crf = this.video_crf;
imp.remove_avi = this.remove_avi;
imp.video_codec_combo = this.video_codec_combo;
imp.video_crf_combo = this.video_crf_combo;
imp.add_average = this.add_average;
imp.subtract_average = this.subtract_average;
imp.running_average = this.running_average;
imp.extract_center_orientation=this.extract_center_orientation;
imp.um_mono = this. um_mono;
imp.um_sigma = this. um_sigma;
imp.um_weight = this. um_weight;
imp.mono_fixed = this. mono_fixed;
imp.mono_range = this. mono_range;
imp.anaglyth_en = this. anaglyth_en;
imp.anaglyph_left = this. anaglyph_left;
imp.anaglyph_right = this. anaglyph_right;
imp.annotate_color = this. annotate_color;
imp.annotate_mono = this. annotate_mono;
imp.annotate_color_color = this. annotate_color_color;
imp.annotate_color_mono = this. annotate_color_mono;
imp.um_mono = this.um_mono;
imp.um_sigma = this.um_sigma;
imp.um_weight = this.um_weight;
imp.um_mono_linear = this.um_mono_linear;
imp.mono_fixed = this.mono_fixed;
imp.mono_range = this.mono_range;
imp.anaglyth_en = this.anaglyth_en;
imp.anaglyph_left = this.anaglyph_left;
imp.anaglyph_right = this.anaglyph_right;
imp.annotate_color = this.annotate_color;
imp.annotate_mono = this.annotate_mono;
imp.annotate_color_color = this.annotate_color_color;
imp.annotate_color_mono = this.annotate_color_mono;
imp.annotate_transparent_mono = this. annotate_transparent_mono;
// vegetation
......
src/main/java/com/elphel/imagej/tileprocessor/QuadCLTCPU.java
View file @ 8550fc6e
......@@ -222,6 +222,17 @@ public class QuadCLTCPU {
@Deprecated
public boolean center_is_parent = false; // when true - use image_path that discards current version
public String center_parent_dir = null;
public ImagePlus imp_center_average = null;
public ImagePlus getCenterAverage() {
return imp_center_average;
}
public void setCenterAverage(ImagePlus imp_center_average) {
this.imp_center_average = imp_center_average;
}
@Deprecated
public boolean isCenterParent() {
......
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