Commit 1a664c2b authored by Andrey Filippov's avatar Andrey Filippov

removed obsolete data output

parent 82208513
This diff is collapsed.
...@@ -231,9 +231,9 @@ public class LensAdjustment { ...@@ -231,9 +231,9 @@ public class LensAdjustment {
public String comment="no comments"; // Comment to add to the results public String comment="no comments"; // Comment to add to the results
public int lensSerialLength=4; public int lensSerialLength=4;
public String lensSerial=""; // Lens serial number public String lensSerial=""; // Lens serial number
public boolean askLensSerial=true; // Ask lens serial on camera power cycle public boolean askLensSerial=true; // Ask lens serial on camera power cycle
public double reportTemperature=50; // temperature to report focal length public double reportTemperature=50; // temperature to report focal length
public boolean showLegacy=false; // Show old focusing parameters (most are not supported anyway)
public boolean includeLensSerial=true; // add lens serial to config filename public boolean includeLensSerial=true; // add lens serial to config filename
public double centerDeltaX=0.0; // required X-difference between lens center and sensor center public double centerDeltaX=0.0; // required X-difference between lens center and sensor center
public double centerDeltaY=0.0; // required Y-difference between lens center and sensor center public double centerDeltaY=0.0; // required Y-difference between lens center and sensor center
...@@ -606,7 +606,8 @@ public class LensAdjustment { ...@@ -606,7 +606,8 @@ public class LensAdjustment {
boolean cameraIsConfigured, boolean cameraIsConfigured,
int [] motorPos, int [] motorPos,
double [] ampsSeconds, // cumulative Amps*seconds (read only, but will be saved/restored) double [] ampsSeconds, // cumulative Amps*seconds (read only, but will be saved/restored)
double reportTemperature // temperature to report focal length double reportTemperature, // temperature to report focal length
boolean showLegacy
){ ){
this.gridGeometryFile=gridGeometryFile; this.gridGeometryFile=gridGeometryFile;
this.initialCalibrationFile=initialCalibrationFile; this.initialCalibrationFile=initialCalibrationFile;
...@@ -763,7 +764,7 @@ public class LensAdjustment { ...@@ -763,7 +764,7 @@ public class LensAdjustment {
this.motorPos=motorPos; this.motorPos=motorPos;
this.ampsSeconds=ampsSeconds; // cumulative Amps*seconds (read only, but will be saved/restored) this.ampsSeconds=ampsSeconds; // cumulative Amps*seconds (read only, but will be saved/restored)
this.reportTemperature=reportTemperature; this.reportTemperature=reportTemperature;
this.showLegacy=showLegacy;
} }
public FocusMeasurementParameters clone(){ public FocusMeasurementParameters clone(){
return new FocusMeasurementParameters( return new FocusMeasurementParameters(
...@@ -921,7 +922,8 @@ public class LensAdjustment { ...@@ -921,7 +922,8 @@ public class LensAdjustment {
this.cameraIsConfigured, this.cameraIsConfigured,
this.motorPos, this.motorPos,
this.ampsSeconds, // cumulative Amps*seconds (read only, but will be saved/restored) this.ampsSeconds, // cumulative Amps*seconds (read only, but will be saved/restored)
this.reportTemperature this.reportTemperature,
this.showLegacy
); );
} }
public void setProperties(String prefix,Properties properties){ public void setProperties(String prefix,Properties properties){
...@@ -1092,6 +1094,7 @@ public class LensAdjustment { ...@@ -1092,6 +1094,7 @@ public class LensAdjustment {
for (int i=0;i<this.ampsSeconds.length;i++) for (int i=0;i<this.ampsSeconds.length;i++)
properties.setProperty(prefix+"ampsSeconds_"+i,this.ampsSeconds[i]+""); properties.setProperty(prefix+"ampsSeconds_"+i,this.ampsSeconds[i]+"");
properties.setProperty(prefix+"reportTemperature",this.reportTemperature+""); properties.setProperty(prefix+"reportTemperature",this.reportTemperature+"");
properties.setProperty(prefix+"showLegacy",this.showLegacy+"");
} }
public void getProperties(String prefix,Properties properties){ public void getProperties(String prefix,Properties properties){
if (properties.getProperty(prefix+"gridGeometryFile")!=null) if (properties.getProperty(prefix+"gridGeometryFile")!=null)
...@@ -1427,6 +1430,8 @@ public class LensAdjustment { ...@@ -1427,6 +1430,8 @@ public class LensAdjustment {
this.ampsSeconds[i]=Double.parseDouble(properties.getProperty(prefix+"ampsSeconds_"+i)); this.ampsSeconds[i]=Double.parseDouble(properties.getProperty(prefix+"ampsSeconds_"+i));
if (properties.getProperty(prefix+"reportTemperature")!=null) if (properties.getProperty(prefix+"reportTemperature")!=null)
this.reportTemperature=Double.parseDouble(properties.getProperty(prefix+"reportTemperature")); this.reportTemperature=Double.parseDouble(properties.getProperty(prefix+"reportTemperature"));
if (properties.getProperty(prefix+"showLegacy")!=null)
this.showLegacy=Boolean.parseBoolean(properties.getProperty(prefix+"showLegacy"));
} }
public boolean getLensSerial(){ public boolean getLensSerial(){
while (true) { // loop until OK-ed while (true) { // loop until OK-ed
...@@ -1696,6 +1701,7 @@ public class LensAdjustment { ...@@ -1696,6 +1701,7 @@ public class LensAdjustment {
gd.addMessage("-----"); gd.addMessage("-----");
gd.addNumericField("Report focal length at this temperature", this.reportTemperature, 1,5,"C"); gd.addNumericField("Report focal length at this temperature", this.reportTemperature, 1,5,"C");
gd.addCheckbox ("Show legacy focusing parameters (most are already not supported anyway)", this.showLegacy);
if (!Double.isNaN(this.sensorTemperature)) gd.addMessage("Last measured sensor temperature is "+this.sensorTemperature+" C"); if (!Double.isNaN(this.sensorTemperature)) gd.addMessage("Last measured sensor temperature is "+this.sensorTemperature+" C");
...@@ -1888,6 +1894,7 @@ public class LensAdjustment { ...@@ -1888,6 +1894,7 @@ public class LensAdjustment {
this.postUVscrewSensitivity[i]= gd.getNextNumber(); this.postUVscrewSensitivity[i]= gd.getNextNumber();
} }
this.reportTemperature= gd.getNextNumber(); this.reportTemperature= gd.getNextNumber();
this.showLegacy= gd.getNextBoolean();
return true; return true;
} }
/* ======================================================================== */ /* ======================================================================== */
......
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