Loading src/main/java/com/elphel/imagej/tileprocessor/IntersceneMatchParameters.java +21 −4 Original line number Diff line number Diff line Loading @@ -859,6 +859,7 @@ min_str_neib_fpn 0.35 // combine parameters public boolean terr_crop = true; // Crop output image to the bounds of all segments public int terr_border_width = 6; public boolean terr_render_open = true; // render open areas (no vegetation offset) public boolean terr_render_no_alpha = true; // render where no opacity is available Loading @@ -876,6 +877,8 @@ min_str_neib_fpn 0.35 public double terr_min_terrain = 0.001; public double terr_min_vegetation = 0.5; public int terr_debug = 0; public String terr_debug_path = "/media/elphel/SSD3-4GB/lwir16-proc/berdich3/debug/vegetation/lma_um/"; public int terr_debug_length = 200; public boolean terr_debug_improved = true; // Save debug data if LMA step improved public boolean terr_debug_worsened = true; // Save debug data if LMA step improved Loading Loading @@ -2191,6 +2194,7 @@ min_str_neib_fpn 0.35 gd.addMessage ("Combining LMA results segments"); gd.addCheckbox ("Crop result image", terr_crop, "Crop output image to the bounds of all segments."); gd.addNumericField("Overlap width", terr_border_width, 0,3,"","Width of the inter-tile oiverlap border."); gd.addCheckbox ("Render open", terr_render_open, ""); gd.addCheckbox ("Render no alpha", terr_render_no_alpha, ""); Loading @@ -2206,7 +2210,9 @@ min_str_neib_fpn 0.35 gd.addNumericField("Min max terrain", terr_min_max_terrain, 5,7,"", "."); gd.addNumericField("Minimal terrain", terr_min_terrain, 5,7,"", "."); gd.addNumericField("Minimal vegetation", terr_min_vegetation, 5,7,"", "."); gd.addNumericField("LMA debug level", terr_debug, 0,3,"", "."); gd.addNumericField("LMA debug level", terr_debug, 0,3,"", "Debug level."); gd.addStringField ("Debug directory", terr_debug_path, 120,"Directory to save debug images."); gd.addNumericField("Debug length", terr_debug_length, 0,3,"","Maximal number of debug image slices."); gd.addCheckbox ("Debug improved", terr_debug_improved, "Save debug image after successful LMA step."); gd.addCheckbox ("Debug worsened", terr_debug_worsened, "Save debug image after unsuccessful LMA step."); Loading Loading @@ -2939,6 +2945,7 @@ min_str_neib_fpn 0.35 terr_recalc_boost = gd.getNextNumber(); // double terr_recalc_average = gd.getNextBoolean();// boolean terr_crop = gd.getNextBoolean();// boolean terr_border_width = (int) gd.getNextNumber(); // int terr_render_open = gd.getNextBoolean();// boolean terr_render_no_alpha = gd.getNextBoolean();// boolean Loading @@ -2954,6 +2961,8 @@ min_str_neib_fpn 0.35 terr_min_terrain = gd.getNextNumber();// double terr_min_vegetation = gd.getNextNumber();// double terr_debug = (int) gd.getNextNumber(); // int terr_debug_path = gd.getNextString(); // String terr_debug_length = (int) gd.getNextNumber(); // int terr_debug_improved = gd.getNextBoolean();// boolean terr_debug_worsened = gd.getNextBoolean();// boolean // end of vegetation Loading Loading @@ -3663,6 +3672,7 @@ min_str_neib_fpn 0.35 properties.setProperty(prefix+"terr_recalc_boost", terr_recalc_boost+""); // double properties.setProperty(prefix+"terr_recalc_average", terr_recalc_average+""); // boolean properties.setProperty(prefix+"terr_crop", terr_crop+""); // boolean properties.setProperty(prefix+"terr_border_width", terr_border_width+""); // int properties.setProperty(prefix+"terr_render_open", terr_render_open+""); // boolean properties.setProperty(prefix+"terr_render_no_alpha", terr_render_no_alpha+""); // boolean Loading @@ -3678,6 +3688,8 @@ min_str_neib_fpn 0.35 properties.setProperty(prefix+"terr_min_terrain", terr_min_terrain+""); // double properties.setProperty(prefix+"terr_min_vegetation", terr_min_vegetation+""); // double properties.setProperty(prefix+"terr_debug", terr_debug+""); // int properties.setProperty(prefix+"terr_debug_path", terr_debug_path+""); // String properties.setProperty(prefix+"terr_debug_length", terr_debug_length+""); // int properties.setProperty(prefix+"terr_debug_improved", terr_debug_improved+""); // boolean properties.setProperty(prefix+"terr_debug_worsened", terr_debug_worsened+""); // boolean // end of vegetation Loading Loading @@ -4411,6 +4423,7 @@ min_str_neib_fpn 0.35 if (properties.getProperty(prefix+"terr_recalc_boost")!= null) terr_recalc_boost=Double.parseDouble(properties.getProperty(prefix+"terr_recalc_boost")); if (properties.getProperty(prefix+"terr_recalc_average")!= null) terr_recalc_average=Boolean.parseBoolean(properties.getProperty(prefix+"terr_recalc_average")); if (properties.getProperty(prefix+"terr_crop")!= null) terr_crop=Boolean.parseBoolean(properties.getProperty(prefix+"terr_crop")); if (properties.getProperty(prefix+"terr_border_width")!= null) terr_border_width=Integer.parseInt(properties.getProperty(prefix+"terr_border_width")); if (properties.getProperty(prefix+"terr_render_open")!= null) terr_render_open=Boolean.parseBoolean(properties.getProperty(prefix+"terr_render_open")); if (properties.getProperty(prefix+"terr_render_no_alpha")!= null) terr_render_no_alpha=Boolean.parseBoolean(properties.getProperty(prefix+"terr_render_no_alpha")); Loading @@ -4426,6 +4439,8 @@ min_str_neib_fpn 0.35 if (properties.getProperty(prefix+"terr_min_terrain")!= null) terr_min_terrain=Double.parseDouble(properties.getProperty(prefix+"terr_min_terrain")); if (properties.getProperty(prefix+"terr_min_vegetation")!= null) terr_min_vegetation=Double.parseDouble(properties.getProperty(prefix+"terr_min_vegetation")); if (properties.getProperty(prefix+"terr_debug")!= null) terr_debug=Integer.parseInt(properties.getProperty(prefix+"terr_debug")); if (properties.getProperty(prefix+"terr_debug_path")!= null) terr_debug_path=(String) properties.getProperty(prefix+"terr_debug_path"); if (properties.getProperty(prefix+"terr_debug_length")!= null) terr_debug_length=Integer.parseInt(properties.getProperty(prefix+"terr_debug_length")); if (properties.getProperty(prefix+"terr_debug_improved")!= null) terr_debug_improved=Boolean.parseBoolean(properties.getProperty(prefix+"terr_debug_improved")); if (properties.getProperty(prefix+"terr_debug_worsened")!= null) terr_debug_worsened=Boolean.parseBoolean(properties.getProperty(prefix+"terr_debug_worsened")); // end of vegetation Loading Loading @@ -5119,6 +5134,7 @@ min_str_neib_fpn 0.35 imp.terr_recalc_boost = this.terr_recalc_boost; imp.terr_recalc_average = this.terr_recalc_average; imp.terr_crop = this.terr_crop; imp.terr_border_width = this.terr_border_width; imp.terr_render_open = this.terr_render_open; imp.terr_render_no_alpha = this.terr_render_no_alpha; Loading @@ -5134,7 +5150,8 @@ min_str_neib_fpn 0.35 imp.terr_min_terrain = this.terr_min_terrain; imp.terr_min_vegetation = this.terr_min_vegetation; imp.terr_debug = this.terr_debug; imp.terr_debug_path = this.terr_debug_path; imp.terr_debug_length = this.terr_debug_length; imp.terr_debug_improved = this.terr_debug_improved; imp.terr_debug_worsened = this.terr_debug_worsened; // end of vegetation Loading Loading
src/main/java/com/elphel/imagej/tileprocessor/IntersceneMatchParameters.java +21 −4 Original line number Diff line number Diff line Loading @@ -859,6 +859,7 @@ min_str_neib_fpn 0.35 // combine parameters public boolean terr_crop = true; // Crop output image to the bounds of all segments public int terr_border_width = 6; public boolean terr_render_open = true; // render open areas (no vegetation offset) public boolean terr_render_no_alpha = true; // render where no opacity is available Loading @@ -876,6 +877,8 @@ min_str_neib_fpn 0.35 public double terr_min_terrain = 0.001; public double terr_min_vegetation = 0.5; public int terr_debug = 0; public String terr_debug_path = "/media/elphel/SSD3-4GB/lwir16-proc/berdich3/debug/vegetation/lma_um/"; public int terr_debug_length = 200; public boolean terr_debug_improved = true; // Save debug data if LMA step improved public boolean terr_debug_worsened = true; // Save debug data if LMA step improved Loading Loading @@ -2191,6 +2194,7 @@ min_str_neib_fpn 0.35 gd.addMessage ("Combining LMA results segments"); gd.addCheckbox ("Crop result image", terr_crop, "Crop output image to the bounds of all segments."); gd.addNumericField("Overlap width", terr_border_width, 0,3,"","Width of the inter-tile oiverlap border."); gd.addCheckbox ("Render open", terr_render_open, ""); gd.addCheckbox ("Render no alpha", terr_render_no_alpha, ""); Loading @@ -2206,7 +2210,9 @@ min_str_neib_fpn 0.35 gd.addNumericField("Min max terrain", terr_min_max_terrain, 5,7,"", "."); gd.addNumericField("Minimal terrain", terr_min_terrain, 5,7,"", "."); gd.addNumericField("Minimal vegetation", terr_min_vegetation, 5,7,"", "."); gd.addNumericField("LMA debug level", terr_debug, 0,3,"", "."); gd.addNumericField("LMA debug level", terr_debug, 0,3,"", "Debug level."); gd.addStringField ("Debug directory", terr_debug_path, 120,"Directory to save debug images."); gd.addNumericField("Debug length", terr_debug_length, 0,3,"","Maximal number of debug image slices."); gd.addCheckbox ("Debug improved", terr_debug_improved, "Save debug image after successful LMA step."); gd.addCheckbox ("Debug worsened", terr_debug_worsened, "Save debug image after unsuccessful LMA step."); Loading Loading @@ -2939,6 +2945,7 @@ min_str_neib_fpn 0.35 terr_recalc_boost = gd.getNextNumber(); // double terr_recalc_average = gd.getNextBoolean();// boolean terr_crop = gd.getNextBoolean();// boolean terr_border_width = (int) gd.getNextNumber(); // int terr_render_open = gd.getNextBoolean();// boolean terr_render_no_alpha = gd.getNextBoolean();// boolean Loading @@ -2954,6 +2961,8 @@ min_str_neib_fpn 0.35 terr_min_terrain = gd.getNextNumber();// double terr_min_vegetation = gd.getNextNumber();// double terr_debug = (int) gd.getNextNumber(); // int terr_debug_path = gd.getNextString(); // String terr_debug_length = (int) gd.getNextNumber(); // int terr_debug_improved = gd.getNextBoolean();// boolean terr_debug_worsened = gd.getNextBoolean();// boolean // end of vegetation Loading Loading @@ -3663,6 +3672,7 @@ min_str_neib_fpn 0.35 properties.setProperty(prefix+"terr_recalc_boost", terr_recalc_boost+""); // double properties.setProperty(prefix+"terr_recalc_average", terr_recalc_average+""); // boolean properties.setProperty(prefix+"terr_crop", terr_crop+""); // boolean properties.setProperty(prefix+"terr_border_width", terr_border_width+""); // int properties.setProperty(prefix+"terr_render_open", terr_render_open+""); // boolean properties.setProperty(prefix+"terr_render_no_alpha", terr_render_no_alpha+""); // boolean Loading @@ -3678,6 +3688,8 @@ min_str_neib_fpn 0.35 properties.setProperty(prefix+"terr_min_terrain", terr_min_terrain+""); // double properties.setProperty(prefix+"terr_min_vegetation", terr_min_vegetation+""); // double properties.setProperty(prefix+"terr_debug", terr_debug+""); // int properties.setProperty(prefix+"terr_debug_path", terr_debug_path+""); // String properties.setProperty(prefix+"terr_debug_length", terr_debug_length+""); // int properties.setProperty(prefix+"terr_debug_improved", terr_debug_improved+""); // boolean properties.setProperty(prefix+"terr_debug_worsened", terr_debug_worsened+""); // boolean // end of vegetation Loading Loading @@ -4411,6 +4423,7 @@ min_str_neib_fpn 0.35 if (properties.getProperty(prefix+"terr_recalc_boost")!= null) terr_recalc_boost=Double.parseDouble(properties.getProperty(prefix+"terr_recalc_boost")); if (properties.getProperty(prefix+"terr_recalc_average")!= null) terr_recalc_average=Boolean.parseBoolean(properties.getProperty(prefix+"terr_recalc_average")); if (properties.getProperty(prefix+"terr_crop")!= null) terr_crop=Boolean.parseBoolean(properties.getProperty(prefix+"terr_crop")); if (properties.getProperty(prefix+"terr_border_width")!= null) terr_border_width=Integer.parseInt(properties.getProperty(prefix+"terr_border_width")); if (properties.getProperty(prefix+"terr_render_open")!= null) terr_render_open=Boolean.parseBoolean(properties.getProperty(prefix+"terr_render_open")); if (properties.getProperty(prefix+"terr_render_no_alpha")!= null) terr_render_no_alpha=Boolean.parseBoolean(properties.getProperty(prefix+"terr_render_no_alpha")); Loading @@ -4426,6 +4439,8 @@ min_str_neib_fpn 0.35 if (properties.getProperty(prefix+"terr_min_terrain")!= null) terr_min_terrain=Double.parseDouble(properties.getProperty(prefix+"terr_min_terrain")); if (properties.getProperty(prefix+"terr_min_vegetation")!= null) terr_min_vegetation=Double.parseDouble(properties.getProperty(prefix+"terr_min_vegetation")); if (properties.getProperty(prefix+"terr_debug")!= null) terr_debug=Integer.parseInt(properties.getProperty(prefix+"terr_debug")); if (properties.getProperty(prefix+"terr_debug_path")!= null) terr_debug_path=(String) properties.getProperty(prefix+"terr_debug_path"); if (properties.getProperty(prefix+"terr_debug_length")!= null) terr_debug_length=Integer.parseInt(properties.getProperty(prefix+"terr_debug_length")); if (properties.getProperty(prefix+"terr_debug_improved")!= null) terr_debug_improved=Boolean.parseBoolean(properties.getProperty(prefix+"terr_debug_improved")); if (properties.getProperty(prefix+"terr_debug_worsened")!= null) terr_debug_worsened=Boolean.parseBoolean(properties.getProperty(prefix+"terr_debug_worsened")); // end of vegetation Loading Loading @@ -5119,6 +5134,7 @@ min_str_neib_fpn 0.35 imp.terr_recalc_boost = this.terr_recalc_boost; imp.terr_recalc_average = this.terr_recalc_average; imp.terr_crop = this.terr_crop; imp.terr_border_width = this.terr_border_width; imp.terr_render_open = this.terr_render_open; imp.terr_render_no_alpha = this.terr_render_no_alpha; Loading @@ -5134,7 +5150,8 @@ min_str_neib_fpn 0.35 imp.terr_min_terrain = this.terr_min_terrain; imp.terr_min_vegetation = this.terr_min_vegetation; imp.terr_debug = this.terr_debug; imp.terr_debug_path = this.terr_debug_path; imp.terr_debug_length = this.terr_debug_length; imp.terr_debug_improved = this.terr_debug_improved; imp.terr_debug_worsened = this.terr_debug_worsened; // end of vegetation Loading