Commit b3ad74ea authored by Andrey Filippov's avatar Andrey Filippov
Browse files

restored loading initial LMA parameters from the previously saved ones

parent a8718162

src/main/java/com/elphel/imagej/tileprocessor/IntersceneMatchParameters.java

+40 −16
Original line number Diff line number Diff line
@@ -723,6 +723,9 @@ min_str_neib_fpn 0.35 
	public String    terr_model_path =  "/media/elphel/SSD3-4GB/lwir16-proc/berdich3/models/models_1697875868-1697879449-b/1697877487_245877/v35";

	public String    terr_model_state = "1697877487_245877-TERR-VEG-STATE"; 

	public String    terr_segments_dir = "sections"; 

	public String    terr_par_dir =           "";      // directory path to intermediate parameters

	public String    terr_par_file =          "";      // file name of the  intermediate parameters

	public boolean   terr_par_restore =       false;   // restore parameters from file

	// terrain/vegetation parameters

	public boolean   terr_um_en =             true;

	public double    terr_um_sigma =           1.0;
@@ -1997,6 +2000,10 @@ min_str_neib_fpn 0.35 
		gd.addStringField ("Model state file",   terr_model_state, 50, "Model vegetation source data (w/o extension).");

		gd.addStringField ("Segments subdir",    terr_segments_dir, 50,"Model vegetation source data (w/o extension).");

		

		gd.addStringField ("Restore directory",  terr_par_dir, 120,     "Directory to resore initial parameters from.");

		gd.addStringField ("Restore file",       terr_par_file, 120,    "Filename to resore initial parameters from.");

		gd.addCheckbox    ("Restore parameters", terr_par_restore,     "Restore initial parameters from file before running LMA.");

		

		gd.addMessage     ("Unsharp mask filter of the input data (currently not used as both DC and HF fitting are implemented simultaneously).");

		gd.addCheckbox    ("Enable UM",          terr_um_en,           "Enable unsharp mask filter.");

		gd.addNumericField("UM sigma",           terr_um_sigma, 5,7,   "pix", "Unsharp mask sigma.");
@@ -2717,6 +2724,11 @@ min_str_neib_fpn 0.35 
		terr_model_path =          gd.getNextString();

		terr_model_state =         gd.getNextString();

		terr_segments_dir =        gd.getNextString();

		

		terr_par_dir =             gd.getNextString();

		terr_par_file =            gd.getNextString();

		terr_par_restore =         gd.getNextBoolean(); // boolean

		

		terr_um_en =               gd.getNextBoolean(); // boolean

		terr_um_sigma =            gd.getNextNumber();  // double 

		terr_um_weight =           gd.getNextNumber();  // double
@@ -3395,6 +3407,10 @@ min_str_neib_fpn 0.35 
		properties.setProperty(prefix+"terr_model_state",            terr_model_state+"");        // String

		properties.setProperty(prefix+"terr_segments_dir",           terr_segments_dir+"");       // String

		

		properties.setProperty(prefix+"terr_par_dir",                terr_par_dir+"");            // String

		properties.setProperty(prefix+"terr_par_file",               terr_par_file+"");           // String

		properties.setProperty(prefix+"terr_par_restore",            terr_par_restore+"");        // boolean

		

		properties.setProperty(prefix+"terr_um_en",                  terr_um_en+"");              // boolean

		properties.setProperty(prefix+"terr_um_sigma",               terr_um_sigma+"");           // double 

		properties.setProperty(prefix+"terr_um_weight",              terr_um_weight+"");          // double
@@ -4095,6 +4111,10 @@ min_str_neib_fpn 0.35 
		if (properties.getProperty(prefix+"terr_model_state")!=        null) terr_model_state=(String) properties.getProperty(prefix+"terr_model_state");

		if (properties.getProperty(prefix+"terr_segments_dir")!=       null) terr_segments_dir=(String) properties.getProperty(prefix+"terr_segments_dir");



		if (properties.getProperty(prefix+"terr_par_dir")!=            null) terr_par_dir=(String) properties.getProperty(prefix+"terr_par_dir");

		if (properties.getProperty(prefix+"terr_par_file")!=           null) terr_par_file=(String) properties.getProperty(prefix+"terr_par_file");

		if (properties.getProperty(prefix+"terr_par_restore")!=        null) terr_par_restore=Boolean.parseBoolean(properties.getProperty(prefix+"terr_par_restore"));

		

		if (properties.getProperty(prefix+"terr_um_en")!=              null) terr_um_en=Boolean.parseBoolean(properties.getProperty(prefix+"terr_um_en"));

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

		if (properties.getProperty(prefix+"terr_um_weight")!=          null) terr_um_weight=Double.parseDouble(properties.getProperty(prefix+"terr_um_weight"));
@@ -4762,6 +4782,10 @@ min_str_neib_fpn 0.35 
		imp.terr_model_state =                   this. terr_model_state;

		imp.terr_segments_dir =                  this. terr_segments_dir;

		

		imp.terr_par_dir =                       this. terr_par_dir;

		imp.terr_par_file =                      this. terr_par_file;

		imp.terr_par_restore =                   this.terr_par_restore;    

		

		imp.terr_um_en =                         this.terr_um_en;    

		imp.terr_um_sigma =                      this.terr_um_sigma; 

		imp.terr_um_weight =                     this.terr_um_weight;