Commit eeacc90a authored by Andrey Filippov's avatar Andrey Filippov

temporarily hard-wired half-step in scene sequence traversing.

parent 8a35a76a
...@@ -1104,7 +1104,7 @@ public class GroundPlane { ...@@ -1104,7 +1104,7 @@ public class GroundPlane {
return null; return null;
} }
double [][] ground_xyzatr = ErsCorrection.invertXYZATR(to_ground_xyzatr); // straight down from the camera, then rotated double [][] ground_xyzatr = ErsCorrection.invertXYZATR(to_ground_xyzatr); // straight down from the camera, then rotated
double altitude = ground_xyzatr[0][2] - offset; // offset to the ground level (negative) double altitude = ground_xyzatr[0][2] + offset; // offset to the ground level (negative)
double true_disparity = ref_Clt.getGeometryCorrection().getDisparityFromZ(-altitude); double true_disparity = ref_Clt.getGeometryCorrection().getDisparityFromZ(-altitude);
double corrected_disparity = true_disparity+ref_Clt.getDispInfinityRef(); double corrected_disparity = true_disparity+ref_Clt.getDispInfinityRef();
int tilesX = ref_Clt.getTilesX(); int tilesX = ref_Clt.getTilesX();
......
...@@ -2261,7 +2261,7 @@ public class QuadCLTCPU { ...@@ -2261,7 +2261,7 @@ public class QuadCLTCPU {
rslt_suffix += (clt_parameters.correlate_lma?"-LMA":"-NOLMA"); rslt_suffix += (clt_parameters.correlate_lma?"-LMA":"-NOLMA");
final int tilesX = tp.getTilesX(); final int tilesX = tp.getTilesX();
final int tilesY = tp.getTilesY(); final int tilesY = tp.getTilesY();
saveDoubleArrayInModelDirectory( // error saveDoubleArrayInModelDirectory( // prints "saveDoubleArrayInModelDirectory(): saved ..."
rslt_suffix, // String suffix, rslt_suffix, // String suffix,
OpticalFlow.COMBO_DSN_TITLES, // combo_dsn_titles_full, // null, // String [] labels, // or null OpticalFlow.COMBO_DSN_TITLES, // combo_dsn_titles_full, // null, // String [] labels, // or null
combo_dsn_final, // dbg_data, // double [][] data, combo_dsn_final, // dbg_data, // double [][] data,
...@@ -4803,7 +4803,9 @@ public class QuadCLTCPU { ...@@ -4803,7 +4803,9 @@ public class QuadCLTCPU {
combo_dsi, // double [][] dsi, // if null - just check file exists combo_dsi, // double [][] dsi, // if null - just check file exists
silent); // boolean silent); silent); // boolean silent);
if (num_slices >= 0) { if (num_slices >= 0) {
if (!silent) {
System.out.println ("restoreComboDSI(): used "+getX3dDirectory()+ Prefs.getFileSeparator() + image_name + extra_suffix + DSI_SUFFIXES[indx] + ".tiff"); System.out.println ("restoreComboDSI(): used "+getX3dDirectory()+ Prefs.getFileSeparator() + image_name + extra_suffix + DSI_SUFFIXES[indx] + ".tiff");
}
setDSIFromCombo(combo_dsi); // reformat setDSIFromCombo(combo_dsi); // reformat
return combo_dsi; return combo_dsi;
} }
...@@ -5218,11 +5220,13 @@ public class QuadCLTCPU { ...@@ -5218,11 +5220,13 @@ public class QuadCLTCPU {
} }
return -1; return -1;
} }
if (!silent) {
if (dsi == null) { if (dsi == null) {
System.out.println("restoreDSI(): has "+imp.getStackSize()+" slices in file: "+file_path); System.out.println("restoreDSI(): has "+imp.getStackSize()+" slices in file: "+file_path);
} else { } else {
System.out.println("restoreDSI(): got "+imp.getStackSize()+" slices from file: "+file_path); System.out.println("restoreDSI(): got "+imp.getStackSize()+" slices from file: "+file_path);
} }
}
if (imp.getStackSize() < 2) { if (imp.getStackSize() < 2) {
if (!silent) { if (!silent) {
System.out.println ("Failed to read "+file_path); System.out.println ("Failed to read "+file_path);
...@@ -6534,7 +6538,7 @@ public class QuadCLTCPU { ...@@ -6534,7 +6538,7 @@ public class QuadCLTCPU {
ImagePlus imp = new ImagePlus( file_name, imageStack); ImagePlus imp = new ImagePlus( file_name, imageStack);
FileSaver fs=new FileSaver(imp); FileSaver fs=new FileSaver(imp);
fs.saveAsTiff(file_path); fs.saveAsTiff(file_path);
System.out.println("saveDoubleArrayInModelDirectory(): saved "+file_path); System.out.println("saveDoubleArrayInTopModelDirectory(): saved "+file_path);
return imp; return imp;
} }
...@@ -6582,7 +6586,7 @@ public class QuadCLTCPU { ...@@ -6582,7 +6586,7 @@ public class QuadCLTCPU {
FileSaver fs=new FileSaver(imp); FileSaver fs=new FileSaver(imp);
fs.saveAsTiff(file_path); // image processor null? fs.saveAsTiff(file_path); // image processor null?
System.out.println("saveDoubleArrayInModelDirectory(): saved "+file_path); System.out.println("saveImagePlusInModelDirectory(): saved "+file_path);
return file_path; return file_path;
} }
......
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