Commit 4c92ae27 authored by Andrey Filippov's avatar Andrey Filippov
Browse files

Documented OpticalFlow, cleaned up, added configurable 

OpticalFlowParameters
parent 0a156a26

src/main/java/com/elphel/imagej/cameras/CLTParameters.java

+13 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ import com.elphel.imagej.tileprocessor.BiQuadParameters; 
import com.elphel.imagej.tileprocessor.ImageDtt;

import com.elphel.imagej.tileprocessor.ImageDttParameters;

import com.elphel.imagej.tileprocessor.MeasuredLayersFilterParameters;

import com.elphel.imagej.tileprocessor.OpticalFlowParameters;

import com.elphel.imagej.tileprocessor.PoleProcessorParameters;



import ij.gui.GenericDialog;
@@ -869,6 +870,7 @@ public class CLTParameters { 
	public PoleProcessorParameters        poles =   new PoleProcessorParameters();

	public MeasuredLayersFilterParameters mlfp =    new MeasuredLayersFilterParameters();

	public LwirReaderParameters           lwir =    new LwirReaderParameters();

	public OpticalFlowParameters          ofp =     new OpticalFlowParameters();





	public HashMap<String,Double> z_corr_map = new HashMap<String,Double>(); //old one
@@ -1715,6 +1717,8 @@ public class CLTParameters { 
		rig.setProperties     (prefix+"_rig",     properties);

		poles.setProperties   (prefix+"_poles",   properties);

		lwir.setProperties    (prefix+"_lwir",   properties);

		ofp.setProperties     (prefix+"_ofp_",   properties);



	}



	public void setPropertiesInfinityDistance(String prefix,Properties properties){
@@ -2535,6 +2539,7 @@ public class CLTParameters { 
		rig.getProperties     (prefix+"_rig",     properties);

		poles.getProperties   (prefix+"_poles",   properties);

		lwir.getProperties    (prefix+"_lwir",    properties);

		ofp.getProperties     (prefix+"_ofp_",    properties);

	}



	public boolean showJDialog() {
@@ -3498,6 +3503,12 @@ public class CLTParameters { 
		

		gd.addTab         ("LWIR", "parameters for LWIR/EO 8-camera rig");

		this.lwir.dialogQuestions(gd);

		

		

		gd.addTab         ("O-Flow", "parameters for the interscene Optical FLow calculations");

		this.ofp.dialogQuestions(gd);

		

		

		gd.addTab         ("Debug", "Other debug images");

		gd.addMessage     ("--- Other debug images ---");

		//	clt_parameters.debug_initial_discriminate, // final boolean    debug_initial_discriminate,
@@ -4292,6 +4303,7 @@ public class CLTParameters { 
		this.gpu_debug_accum=       gd.getNextBoolean();

		

		this.lwir.dialogAnswers(gd);

		this.ofp.dialogAnswers(gd);



		this.debug_initial_discriminate= gd.getNextBoolean();

		this.dbg_migrate=                gd.getNextBoolean();

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

+18 −1
Original line number Diff line number Diff line
@@ -166,6 +166,23 @@ public class Correlation2d { 
				wndx_scale);                     // double  scale);

      }



    public Correlation2d ( // USED in lwir

    		int transform_size,

    		boolean monochrome,

    		boolean debug) {

    	this.monochrome = monochrome;

    	this.dtt = new DttRad2(transform_size);

    	this.transform_size = transform_size;

    	this.transform_len = transform_size * transform_size;

    	this.corr_size = transform_size * 2 -1;

    	// not initialized until needed

    	this.transpose_all_ortho =     new int [corr_size*corr_size];

    	this.transpose_all_diagonal =  new int [corr_size*corr_size];

    	this.ortho_notch_filter =      new double [corr_size];

    	this.corr_wndy =               null; // will not be used

    	this.corr_wndx =               null; // will not be used

    	this.corr_wndy_notch =         null; // will not be used

    }

    

      public int [] getTransposeAll(boolean diagonal){ // USED in lwir

    	  if (diagonal) return getTransposeAllDiagonal();

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

+868 −708

File changed.

Preview size limit exceeded, changes collapsed.

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

0 → 100644
+316 −0

File added.

Preview size limit exceeded, changes collapsed.

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

+11 −55

File changed.

Preview size limit exceeded, changes collapsed.