Commit eae75ef1 authored by Andrey Filippov's avatar Andrey Filippov

Improving renderSceneSequence()

parent d3c015c3
...@@ -75,6 +75,7 @@ public class CuasRanging { ...@@ -75,6 +75,7 @@ public class CuasRanging {
} }
public ImagePlus prepareFpixels(){ public ImagePlus prepareFpixels(){
boolean dbg_save_fpixels = true;
double [][]combo_dsi = getCenter_CLT().comboFromMain(); double [][]combo_dsi = getCenter_CLT().comboFromMain();
double [][] dls = { double [][] dls = {
combo_dsi[OpticalFlow.COMBO_DSN_INDX_DISP], // **** null on second scene sequence combo_dsi[OpticalFlow.COMBO_DSN_INDX_DISP], // **** null on second scene sequence
...@@ -135,6 +136,37 @@ public class CuasRanging { ...@@ -135,6 +136,37 @@ public class CuasRanging {
double [] cuas_atr = OpticalFlow.ZERO3; double [] cuas_atr = OpticalFlow.ZERO3;
String scenes_suffix = getCenter_CLT().getImageName()+"-CUAS"; // "1747829900_781803-SEQ-FG-MONO-FPN"; String scenes_suffix = getCenter_CLT().getImageName()+"-CUAS"; // "1747829900_781803-SEQ-FG-MONO-FPN";
boolean merge_all = false; // clt_parameters.imp.merge_all || !um_mono; // no unsharp mask -> terrain->merge_all
int sensor_mask = merge_all? 1 : -1;
if (dbg_save_fpixels) {
ImagePlus imp_targets= OpticalFlow.renderSceneSequence(
clt_parameters, // CLTParameters clt_parameters,
true, // center_CLT.hasCenterClt(), // boolean mode_cuas,
false, // clt_parameters.imp.um_mono, // boolean um_mono,
clt_parameters.imp.calculate_average, // boolean insert_average, // then add new parameter, keep add average
null, // int [] average_range,
null, // average_channels, // average_slice,
clt_parameters.imp.subtract_average, // boolean subtract_average,
clt_parameters.imp.running_average, // int running_average,
null, // fov_tiles, // Rectangle fov_tiles,
1, // mode3d, // int mode3d,
false, // toRGB, // boolean toRGB,
xyz_offset, // double [] stereo_offset, // offset reference camera {x,y,z}
cuas_atr, // double [] stereo_atr, // offset reference orientation (cuas)
sensor_mask, // sensor_mask, // int sensor_mask,
merge_all, // boolean merge_all,
scenes_suffix, // String suffix,
ds_vantage[0], // selected_disparity, // double [] ref_disparity,
scenes, // QuadCLT [] quadCLTs,
getCenter_CLT(), // ref_index, // int ref_index,
ImageDtt.THREADS_MAX, // threadsMax, // int threadsMax,
debugLevel); // int debugLevel);
getCenter_CLT().saveImagePlusInModelDirectory(
imp_targets.getTitle()+"-DBG", // "GPU-SHIFTED-D"+clt_parameters.disparity, // String suffix,
imp_targets); // imp_scenes); // ImagePlus imp)
}
merge_all = true; // clt_parameters.imp.merge_all || !um_mono; // no unsharp mask -> terrain->merge_all
sensor_mask = merge_all? 1 : -1;
ImagePlus imp_targets= OpticalFlow.renderSceneSequence( ImagePlus imp_targets= OpticalFlow.renderSceneSequence(
clt_parameters, // CLTParameters clt_parameters, clt_parameters, // CLTParameters clt_parameters,
true, // center_CLT.hasCenterClt(), // boolean mode_cuas, true, // center_CLT.hasCenterClt(), // boolean mode_cuas,
...@@ -149,13 +181,19 @@ public class CuasRanging { ...@@ -149,13 +181,19 @@ public class CuasRanging {
false, // toRGB, // boolean toRGB, false, // toRGB, // boolean toRGB,
xyz_offset, // double [] stereo_offset, // offset reference camera {x,y,z} xyz_offset, // double [] stereo_offset, // offset reference camera {x,y,z}
cuas_atr, // double [] stereo_atr, // offset reference orientation (cuas) cuas_atr, // double [] stereo_atr, // offset reference orientation (cuas)
1, // sensor_mask, // int sensor_mask, sensor_mask, // sensor_mask, // int sensor_mask,
merge_all, // boolean merge_all,
scenes_suffix, // String suffix, scenes_suffix, // String suffix,
ds_vantage[0], // selected_disparity, // double [] ref_disparity, ds_vantage[0], // selected_disparity, // double [] ref_disparity,
scenes, // QuadCLT [] quadCLTs, scenes, // QuadCLT [] quadCLTs,
getCenter_CLT(), // ref_index, // int ref_index, getCenter_CLT(), // ref_index, // int ref_index,
ImageDtt.THREADS_MAX, // threadsMax, // int threadsMax, ImageDtt.THREADS_MAX, // threadsMax, // int threadsMax,
debugLevel); // int debugLevel); debugLevel); // int debugLevel);
if (dbg_save_fpixels) {
getCenter_CLT().saveImagePlusInModelDirectory(
imp_targets.getTitle()+"-DBG", // "GPU-SHIFTED-D"+clt_parameters.disparity, // String suffix,
imp_targets); // imp_scenes); // ImagePlus imp)
}
return imp_targets; return imp_targets;
} }
......
...@@ -1863,8 +1863,8 @@ public class QuadCLT extends QuadCLTCPU { ...@@ -1863,8 +1863,8 @@ public class QuadCLT extends QuadCLTCPU {
public static double [][] preRenderGPUFromDSI( // will return PxPyD public static double [][] preRenderGPUFromDSI( // will return PxPyD
final boolean accumulate, final boolean accumulate,
final double global_scale, // <=1.0 final double global_scale, // <=1.0
final int sensor_mask, final int sensor_mask, // not used
final boolean merge_channels, final boolean merge_channels, // not used
final int discard_border, final int discard_border,
final double max_fold, final double max_fold,
final int min_in_row_col, // Minimal number of defined tiles in a row/column final int min_in_row_col, // Minimal number of defined tiles in a row/column
......
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