Commit 214f7e87 authored by Andrey Filippov's avatar Andrey Filippov

Working snapshot before implementing pull to average terrain temperature

parent 7739a5cb
...@@ -474,12 +474,6 @@ public class Eyesis_Correction implements PlugIn, ActionListener { ...@@ -474,12 +474,6 @@ public class Eyesis_Correction implements PlugIn, ActionListener {
public ImagePlus CORRELATE_IMP = null; public ImagePlus CORRELATE_IMP = null;
public TensorflowInferModel TENSORFLOW_INFER_MODEL = null; public TensorflowInferModel TENSORFLOW_INFER_MODEL = null;
public class SyncCommand {
public boolean isRunning = false;
public AtomicInteger stopRequested = new AtomicInteger(0); // 0 - not requested, 1 - ASAP, 2 - gracefully
public String buttonLabel = "";
}
@Override @Override
public void run(String arg) { public void run(String arg) {
String options = Macro.getOptions(); String options = Macro.getOptions();
...@@ -5803,10 +5797,12 @@ public class Eyesis_Correction implements PlugIn, ActionListener { ...@@ -5803,10 +5797,12 @@ public class Eyesis_Correction implements PlugIn, ActionListener {
OrangeTest.processMerged(); OrangeTest.processMerged();
} else if (label.equals("Vegetation LMA")) { } else if (label.equals("Vegetation LMA")) {
VegetationModel.processVegetation( VegetationModel.processVegetation(
SYNC_COMMAND, // // SyncCommand SYNC_COMMAND,
CLT_PARAMETERS, //CLTParameters clt_parameters, CLT_PARAMETERS, //CLTParameters clt_parameters,
false); //boolean combine_segments); false); //boolean combine_segments);
} else if (label.equals("Combine LMA Segments")) { } else if (label.equals("Combine LMA Segments")) {
VegetationModel.processVegetation( VegetationModel.processVegetation(
SYNC_COMMAND, // // SyncCommand SYNC_COMMAND,
CLT_PARAMETERS, //CLTParameters clt_parameters, CLT_PARAMETERS, //CLTParameters clt_parameters,
true); //boolean combine_segments); true); //boolean combine_segments);
} }
......
package com.elphel.imagej.correction;
import java.util.concurrent.atomic.AtomicInteger;
public class SyncCommand {
public boolean isRunning = false;
public AtomicInteger stopRequested = new AtomicInteger(0); // 0 - not requested, 1 - ASAP, 2 - gracefully
public String buttonLabel = "";
}
\ No newline at end of file
...@@ -2486,7 +2486,7 @@ public class Interscene { ...@@ -2486,7 +2486,7 @@ public class Interscene {
int last_processed_scene = -2; // none int last_processed_scene = -2; // none
/* /*
* There is still a problem with a large mismatch at start position for far off-reference scenes, * There is still a problem with a large mismatch at start position for far off-reference scenes,
* especiall those that were not refined after inversion - reversing order of earlier processed "later" * especially those that were not refined after inversion - reversing order of earlier processed "later"
* half (after the reference in the center) earlier processed as the bottom half of the other sub-sequence. * half (after the reference in the center) earlier processed as the bottom half of the other sub-sequence.
* *
* For mitigation we'll use that both half-sequences start from the center with small mismatches. The * For mitigation we'll use that both half-sequences start from the center with small mismatches. The
...@@ -3006,7 +3006,7 @@ public class Interscene { ...@@ -3006,7 +3006,7 @@ public class Interscene {
if (ref_disparity == null) { if (ref_disparity == null) {
ref_disparity = quadCLTs[ref_index].getDLS()[use_lma_dsi?1:0]; ref_disparity = quadCLTs[ref_index].getDLS()[use_lma_dsi?1:0];
} }
smooth_disparity=true;
if (smooth_disparity) { if (smooth_disparity) {
double [] dbg_disparity = (debugLevel > 2) ? ref_disparity.clone() : null; double [] dbg_disparity = (debugLevel > 2) ? ref_disparity.clone() : null;
boolean [] dbg_reliable = ((dbg_disparity != null) && (reliable_ref != null)) ? reliable_ref.clone(): null; boolean [] dbg_reliable = ((dbg_disparity != null) && (reliable_ref != null)) ? reliable_ref.clone(): null;
......
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