Commit ee4732b5 authored by Andrey Filippov's avatar Andrey Filippov

Before fixing renderGPUFromDSI with offset viewpoint

parent 90aa5914
...@@ -6818,7 +6818,7 @@ public class Eyesis_Correction implements PlugIn, ActionListener { ...@@ -6818,7 +6818,7 @@ public class Eyesis_Correction implements PlugIn, ActionListener {
CLT_PARAMETERS.setRGBParameters(RGB_PARAMETERS); CLT_PARAMETERS.setRGBParameters(RGB_PARAMETERS);
try { try {
TWO_QUAD_CLT.buildSeriesTQ( TwoQuadCLT.buildSeriesTQ(
quadCLT, // QUAD_CLT, // QuadCLT quadCLT_main, quadCLT, // QUAD_CLT, // QuadCLT quadCLT_main,
-1, // int ref_index, -1, // int ref_index,
0, // int ref_step, 0, // int ref_step,
......
...@@ -317,11 +317,13 @@ public class ErsCorrection extends GeometryCorrection { ...@@ -317,11 +317,13 @@ public class ErsCorrection extends GeometryCorrection {
public void setPropertiesScenes(String prefix, Properties properties){ public void setPropertiesScenes(String prefix, Properties properties){
String [] timestamps = getScenes(); String [] timestamps = getScenes();
for (String k : timestamps) { for (String k : timestamps) {
String [] s_scenes = getScene(k).toStrings(); if (getScene(k) != null) {
String [] s_scenes = getScene(k).toStrings(); // null pointer
properties.setProperty(prefix+SCENES_PREFIX+"_"+k, s_scenes[0]); properties.setProperty(prefix+SCENES_PREFIX+"_"+k, s_scenes[0]);
properties.setProperty(prefix+SCENES_PREFIX+"_"+k+"_dt", s_scenes[1]); properties.setProperty(prefix+SCENES_PREFIX+"_"+k+"_dt", s_scenes[1]);
properties.setProperty(prefix+SCENES_PREFIX+"_"+k+"_d2t", s_scenes[2]); properties.setProperty(prefix+SCENES_PREFIX+"_"+k+"_d2t", s_scenes[2]);
// properties.setProperty(prefix+SCENES_PREFIX+"_"+k, getScene(k).toString()); // properties.setProperty(prefix+SCENES_PREFIX+"_"+k, getScene(k).toString());
}
} }
} }
......
...@@ -613,7 +613,7 @@ public class QuadCLT extends QuadCLTCPU { ...@@ -613,7 +613,7 @@ public class QuadCLT extends QuadCLTCPU {
break; break;
} }
fill_all[0] = anum_gaps.get() == 0; // no new tiles filled fill_all[0] = anum_gaps.get() == 0; // no new tiles filled
if (npass == (num_passes-1)){ if ((debug_level>0) && (npass == (num_passes-1))){
System.out.println("fillDisparityStrength() LAST PASS ! npass="+npass+", change="+Math.sqrt(amax_diff.get())+" ("+max_change+")"); System.out.println("fillDisparityStrength() LAST PASS ! npass="+npass+", change="+Math.sqrt(amax_diff.get())+" ("+max_change+")");
System.out.println("fillDisparityStrength() LAST PASS ! npass="+npass+", change="+Math.sqrt(amax_diff.get())+" ("+max_change+")"); System.out.println("fillDisparityStrength() LAST PASS ! npass="+npass+", change="+Math.sqrt(amax_diff.get())+" ("+max_change+")");
System.out.println("fillDisparityStrength() LAST PASS ! npass="+npass+", change="+Math.sqrt(amax_diff.get())+" ("+max_change+")"); System.out.println("fillDisparityStrength() LAST PASS ! npass="+npass+", change="+Math.sqrt(amax_diff.get())+" ("+max_change+")");
...@@ -2198,6 +2198,27 @@ public class QuadCLT extends QuadCLTCPU { ...@@ -2198,6 +2198,27 @@ public class QuadCLT extends QuadCLTCPU {
if (full_woi_in != null) { if (full_woi_in != null) {
rendered_width = full_woi_in.width * GPUTileProcessor.DTT_SIZE; rendered_width = full_woi_in.width * GPUTileProcessor.DTT_SIZE;
} }
boolean showPxPyD = false;
if (showPxPyD) {
int dbg_width = rendered_width/GPUTileProcessor.DTT_SIZE;
int dbg_height = pXpYD.length/dbg_width;
double [][] dbg_img = new double [3][pXpYD.length];
for (int i = 0; i < dbg_img.length; i++) {
Arrays.fill(dbg_img[i], Double.NaN);
}
for (int nTile = 0; nTile < pXpYD.length; nTile++) if (pXpYD[nTile] != null){
for (int i = 0; i < dbg_img.length; i++) {
dbg_img[i][nTile] = pXpYD[nTile][i];
}
}
(new ShowDoubleFloatArrays()).showArrays( // out of boundary 15
dbg_img,
dbg_width,
dbg_height,
true,
"pXpYD",
new String[] {"pX","pY","Disparity"});
}
//scene_QuadClt.getTileProcessor().getTileSize(); //scene_QuadClt.getTileProcessor().getTileSize();
TpTask[] tp_tasks_ref = GpuQuad.setInterTasks( // "true" reference, with stereo actual reference will be offset TpTask[] tp_tasks_ref = GpuQuad.setInterTasks( // "true" reference, with stereo actual reference will be offset
scene.getNumSensors(), scene.getNumSensors(),
......
...@@ -540,7 +540,7 @@ public class QuadCLTCPU { ...@@ -540,7 +540,7 @@ public class QuadCLTCPU {
} }
Properties inter_properties = new Properties(); Properties inter_properties = new Properties();
String prefix = is_aux?PREFIX_AUX:PREFIX; String prefix = is_aux?PREFIX_AUX:PREFIX;
setProperties(prefix,inter_properties); setProperties(prefix,inter_properties); // null pointer
OutputStream os; OutputStream os;
try { try {
os = new FileOutputStream(path); os = new FileOutputStream(path);
...@@ -1634,7 +1634,7 @@ public class QuadCLTCPU { ...@@ -1634,7 +1634,7 @@ public class QuadCLTCPU {
ErsCorrection ers = (ErsCorrection) gc; ErsCorrection ers = (ErsCorrection) gc;
ers.setPropertiesPose(prefix, properties); ers.setPropertiesPose(prefix, properties);
ers.setPropertiesERS(prefix, properties); ers.setPropertiesERS(prefix, properties);
ers.setPropertiesScenes(prefix, properties); ers.setPropertiesScenes(prefix, properties); // null pointer
ers.setPropertiesLineTime(prefix, properties); ers.setPropertiesLineTime(prefix, properties);
} }
properties.setProperty(prefix+"num_orient", this.num_orient+""); properties.setProperty(prefix+"num_orient", this.num_orient+"");
......
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