Skip to content

I
imagej-elphel
Commit 2eaa2039 authored by Andrey Filippov's avatar Andrey Filippov
Browse files
Options

minor cleanup

parent f204d4a8
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 3 deletions
src/main/java/BiQuadParameters.java
View file @ 2eaa2039
...@@ -63,6 +63,7 @@ public class BiQuadParameters { ...@@ -63,6 +63,7 @@ public class BiQuadParameters {
public int rig_adjust_short_cycles= 15; // maximal number of full rig adjustment steps (with current tiles lists) public int rig_adjust_short_cycles= 15; // maximal number of full rig adjustment steps (with current tiles lists)
public double rig_adjust_short_threshold= 0.00001;// rms relative improvement to exit short cycle public double rig_adjust_short_threshold= 0.00001;// rms relative improvement to exit short cycle
public boolean rig_adjust_orientation = true; // public boolean rig_adjust_orientation = true; //
public boolean rig_adjust_roll = true; //
public boolean rig_adjust_zoom = true; // public boolean rig_adjust_zoom = true; //
public boolean rig_adjust_angle = true; // public boolean rig_adjust_angle = true; //
public boolean rig_adjust_distance = false; // distance between camera centers public boolean rig_adjust_distance = false; // distance between camera centers
...@@ -321,7 +322,8 @@ public class BiQuadParameters { ...@@ -321,7 +322,8 @@ public class BiQuadParameters {
"Re-scan only previously selected tiles"); "Re-scan only previously selected tiles");
gd.addNumericField("Minimal RMS improvement after short cycle to exit", this.rig_adjust_short_threshold, 3,6,"", gd.addNumericField("Minimal RMS improvement after short cycle to exit", this.rig_adjust_short_threshold, 3,6,"",
"Short cycle iteration finish after relative RMS improvement is less than this of maximal number of steps is exceeded"); "Short cycle iteration finish after relative RMS improvement is less than this of maximal number of steps is exceeded");
gd.addCheckbox ("Adjust orientation (azimuth, tilt, roll) of the auxiliary camera", this.rig_adjust_orientation,"3 angles, most basic adjustment"); gd.addCheckbox ("Adjust orientation (azimuth, tilt) of the auxiliary camera", this.rig_adjust_orientation,"2 angles, most basic adjustment");
gd.addCheckbox ("Adjust roll of the auxiliary camera", this.rig_adjust_roll,"may be disabled if only a small area of infinity is visible");
gd.addCheckbox ("Adjust relative zoom of the auxiliary camera", this.rig_adjust_zoom,"Not likely to change, may be frozen"); gd.addCheckbox ("Adjust relative zoom of the auxiliary camera", this.rig_adjust_zoom,"Not likely to change, may be frozen");
gd.addCheckbox ("Adjust position of the aux camera in the main camera pricipal plane", this.rig_adjust_angle,"0 - exactly to the right, positive - higher than main"); gd.addCheckbox ("Adjust position of the aux camera in the main camera pricipal plane", this.rig_adjust_angle,"0 - exactly to the right, positive - higher than main");
gd.addCheckbox ("Adjust aux camera distance from the main", this.rig_adjust_distance,"Normally not practical, rely on direct measurement"); gd.addCheckbox ("Adjust aux camera distance from the main", this.rig_adjust_distance,"Normally not practical, rely on direct measurement");
...@@ -681,6 +683,7 @@ public class BiQuadParameters { ...@@ -681,6 +683,7 @@ public class BiQuadParameters {
this.rig_adjust_short_cycles= (int) gd.getNextNumber(); this.rig_adjust_short_cycles= (int) gd.getNextNumber();
this.rig_adjust_short_threshold= gd.getNextNumber(); this.rig_adjust_short_threshold= gd.getNextNumber();
this.rig_adjust_orientation= gd.getNextBoolean(); this.rig_adjust_orientation= gd.getNextBoolean();
this.rig_adjust_roll= gd.getNextBoolean();
this.rig_adjust_zoom= gd.getNextBoolean(); this.rig_adjust_zoom= gd.getNextBoolean();
this.rig_adjust_angle= gd.getNextBoolean(); this.rig_adjust_angle= gd.getNextBoolean();
this.rig_adjust_distance= gd.getNextBoolean(); this.rig_adjust_distance= gd.getNextBoolean();
...@@ -878,6 +881,7 @@ public class BiQuadParameters { ...@@ -878,6 +881,7 @@ public class BiQuadParameters {
properties.setProperty(prefix+"rig_adjust_short_cycles", this.rig_adjust_short_cycles+""); properties.setProperty(prefix+"rig_adjust_short_cycles", this.rig_adjust_short_cycles+"");
properties.setProperty(prefix+"rig_adjust_short_threshold",this.rig_adjust_short_threshold+""); properties.setProperty(prefix+"rig_adjust_short_threshold",this.rig_adjust_short_threshold+"");
properties.setProperty(prefix+"rig_adjust_orientation", this.rig_adjust_orientation+""); properties.setProperty(prefix+"rig_adjust_orientation", this.rig_adjust_orientation+"");
properties.setProperty(prefix+"rig_adjust_roll", this.rig_adjust_roll+"");
properties.setProperty(prefix+"rig_adjust_zoom", this.rig_adjust_zoom+""); properties.setProperty(prefix+"rig_adjust_zoom", this.rig_adjust_zoom+"");
properties.setProperty(prefix+"rig_adjust_angle", this.rig_adjust_angle+""); properties.setProperty(prefix+"rig_adjust_angle", this.rig_adjust_angle+"");
properties.setProperty(prefix+"rig_adjust_distance", this.rig_adjust_distance+""); properties.setProperty(prefix+"rig_adjust_distance", this.rig_adjust_distance+"");
...@@ -1073,6 +1077,7 @@ public class BiQuadParameters { ...@@ -1073,6 +1077,7 @@ public class BiQuadParameters {
if (properties.getProperty(prefix+"rig_adjust_short_cycles")!=null) this.rig_adjust_short_cycles=Integer.parseInt(properties.getProperty(prefix+"rig_adjust_short_cycles")); if (properties.getProperty(prefix+"rig_adjust_short_cycles")!=null) this.rig_adjust_short_cycles=Integer.parseInt(properties.getProperty(prefix+"rig_adjust_short_cycles"));
if (properties.getProperty(prefix+"rig_adjust_short_threshold")!=null) this.rig_adjust_short_threshold=Double.parseDouble(properties.getProperty(prefix+"rig_adjust_short_threshold")); if (properties.getProperty(prefix+"rig_adjust_short_threshold")!=null) this.rig_adjust_short_threshold=Double.parseDouble(properties.getProperty(prefix+"rig_adjust_short_threshold"));
if (properties.getProperty(prefix+"rig_adjust_orientation")!=null) this.rig_adjust_orientation=Boolean.parseBoolean(properties.getProperty(prefix+"rig_adjust_orientation")); if (properties.getProperty(prefix+"rig_adjust_orientation")!=null) this.rig_adjust_orientation=Boolean.parseBoolean(properties.getProperty(prefix+"rig_adjust_orientation"));
if (properties.getProperty(prefix+"rig_adjust_roll")!=null) this.rig_adjust_roll=Boolean.parseBoolean(properties.getProperty(prefix+"rig_adjust_roll"));
if (properties.getProperty(prefix+"rig_adjust_zoom")!=null) this.rig_adjust_zoom=Boolean.parseBoolean(properties.getProperty(prefix+"rig_adjust_zoom")); if (properties.getProperty(prefix+"rig_adjust_zoom")!=null) this.rig_adjust_zoom=Boolean.parseBoolean(properties.getProperty(prefix+"rig_adjust_zoom"));
if (properties.getProperty(prefix+"rig_adjust_angle")!=null) this.rig_adjust_angle=Boolean.parseBoolean(properties.getProperty(prefix+"rig_adjust_angle")); if (properties.getProperty(prefix+"rig_adjust_angle")!=null) this.rig_adjust_angle=Boolean.parseBoolean(properties.getProperty(prefix+"rig_adjust_angle"));
if (properties.getProperty(prefix+"rig_adjust_distance")!=null) this.rig_adjust_distance=Boolean.parseBoolean(properties.getProperty(prefix+"rig_adjust_distance")); if (properties.getProperty(prefix+"rig_adjust_distance")!=null) this.rig_adjust_distance=Boolean.parseBoolean(properties.getProperty(prefix+"rig_adjust_distance"));
...@@ -1273,6 +1278,7 @@ public class BiQuadParameters { ...@@ -1273,6 +1278,7 @@ public class BiQuadParameters {
bqp.rig_adjust_short_cycles= this.rig_adjust_short_cycles; bqp.rig_adjust_short_cycles= this.rig_adjust_short_cycles;
bqp.rig_adjust_short_threshold= this.rig_adjust_short_threshold; bqp.rig_adjust_short_threshold= this.rig_adjust_short_threshold;
bqp.rig_adjust_orientation= this.rig_adjust_orientation; bqp.rig_adjust_orientation= this.rig_adjust_orientation;
bqp.rig_adjust_roll= this.rig_adjust_roll;
bqp.rig_adjust_zoom= this.rig_adjust_zoom; bqp.rig_adjust_zoom= this.rig_adjust_zoom;
bqp.rig_adjust_angle= this.rig_adjust_angle; bqp.rig_adjust_angle= this.rig_adjust_angle;
bqp.rig_adjust_distance= this.rig_adjust_distance; bqp.rig_adjust_distance= this.rig_adjust_distance;
......
src/main/java/GeometryCorrection.java
View file @ 2eaa2039
...@@ -159,6 +159,7 @@ public class GeometryCorrection { ...@@ -159,6 +159,7 @@ public class GeometryCorrection {
double dx_max, // = 0.3; double dx_max, // = 0.3;
double dx_pow, // = 1.0; double dx_pow, // = 1.0;
boolean adjust_orientation, boolean adjust_orientation,
boolean adjust_roll,
boolean adjust_zoom, boolean adjust_zoom,
boolean adjust_angle, boolean adjust_angle,
boolean adjust_distance, boolean adjust_distance,
...@@ -177,6 +178,7 @@ public class GeometryCorrection { ...@@ -177,6 +178,7 @@ public class GeometryCorrection {
dx_max, // double dx_max, // = 0.3; dx_max, // double dx_max, // = 0.3;
dx_pow, // double dx_pow, // = 1.0; dx_pow, // double dx_pow, // = 1.0;
adjust_orientation, // boolean adjust_orientation, adjust_orientation, // boolean adjust_orientation,
adjust_roll, // boolean adjust_roll,
adjust_zoom, // boolean adjust_zoom, adjust_zoom, // boolean adjust_zoom,
adjust_angle, // boolean adjust_angle, adjust_angle, // boolean adjust_angle,
adjust_distance, // boolean adjust_distance, adjust_distance, // boolean adjust_distance,
...@@ -322,6 +324,7 @@ public class GeometryCorrection { ...@@ -322,6 +324,7 @@ public class GeometryCorrection {
public void setVector( public void setVector(
boolean adjust_orientation, boolean adjust_orientation,
boolean adjust_roll,
boolean adjust_zoom, boolean adjust_zoom,
boolean adjust_angle, boolean adjust_angle,
boolean adjust_distance, boolean adjust_distance,
...@@ -330,7 +333,7 @@ public class GeometryCorrection { ...@@ -330,7 +333,7 @@ public class GeometryCorrection {
par_select = new boolean [VECTOR_LENGTH]; par_select = new boolean [VECTOR_LENGTH];
par_select[AUX_AZIMUTH_INDEX] = adjust_orientation; par_select[AUX_AZIMUTH_INDEX] = adjust_orientation;
par_select[AUX_TILT_INDEX] = adjust_orientation; par_select[AUX_TILT_INDEX] = adjust_orientation;
par_select[AUX_ROLL_INDEX] = adjust_orientation; par_select[AUX_ROLL_INDEX] = adjust_roll;
par_select[AUX_ZOOM_INDEX] = adjust_zoom; par_select[AUX_ZOOM_INDEX] = adjust_zoom;
par_select[AUX_ANGLE_INDEX] = adjust_angle; par_select[AUX_ANGLE_INDEX] = adjust_angle;
par_select[AUX_BASELINE_INDEX] = adjust_distance; par_select[AUX_BASELINE_INDEX] = adjust_distance;
...@@ -576,6 +579,7 @@ public class GeometryCorrection { ...@@ -576,6 +579,7 @@ public class GeometryCorrection {
double dx_max, // = 0.3; double dx_max, // = 0.3;
double dx_pow, // = 1.0; double dx_pow, // = 1.0;
boolean adjust_orientation, boolean adjust_orientation,
boolean adjust_roll,
boolean adjust_zoom, boolean adjust_zoom,
boolean adjust_angle, boolean adjust_angle,
boolean adjust_distance, boolean adjust_distance,
...@@ -590,6 +594,7 @@ public class GeometryCorrection { ...@@ -590,6 +594,7 @@ public class GeometryCorrection {
int debugLevel) { int debugLevel) {
setVector(adjust_orientation, setVector(adjust_orientation,
adjust_roll,
adjust_zoom, adjust_zoom,
adjust_angle, adjust_angle,
adjust_distance, adjust_distance,
......
src/main/java/TwoQuadCLT.java
View file @ 2eaa2039
...@@ -1195,6 +1195,7 @@ if (debugLevel > -100) return true; // temporarily ! ...@@ -1195,6 +1195,7 @@ if (debugLevel > -100) return true; // temporarily !
clt_parameters.rig.inf_weight_disp, // double dx_max, // = 0.3; clt_parameters.rig.inf_weight_disp, // double dx_max, // = 0.3;
clt_parameters.rig.inf_weight_disp_pow, // double dx_pow, // = 1.0; clt_parameters.rig.inf_weight_disp_pow, // double dx_pow, // = 1.0;
clt_parameters.rig.rig_adjust_orientation, // boolean adjust_orientation, clt_parameters.rig.rig_adjust_orientation, // boolean adjust_orientation,
clt_parameters.rig.rig_adjust_roll, // boolean adjust_roll,
clt_parameters.rig.rig_adjust_zoom, // boolean adjust_zoom, clt_parameters.rig.rig_adjust_zoom, // boolean adjust_zoom,
clt_parameters.rig.rig_adjust_angle, // boolean adjust_angle, clt_parameters.rig.rig_adjust_angle, // boolean adjust_angle,
clt_parameters.rig.rig_adjust_distance, // boolean adjust_distance, clt_parameters.rig.rig_adjust_distance, // boolean adjust_distance,
......
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