Commit fcf6a510 authored by Andrey Filippov's avatar Andrey Filippov

goniometer manual control

parent 4667c49d
...@@ -136,12 +136,15 @@ horizontal axis: ...@@ -136,12 +136,15 @@ horizontal axis:
gd.addNumericField("Goniometer tilt angle", currentTilt, 1,5,"\u00b0 (positive - look up)"); gd.addNumericField("Goniometer tilt angle", currentTilt, 1,5,"\u00b0 (positive - look up)");
gd.addNumericField("Goniometer axial angle", currentAxial, 1,5,"\u00b0 (positive - CCW)"); gd.addNumericField("Goniometer axial angle", currentAxial, 1,5,"\u00b0 (positive - CCW)");
gd.addCheckbox("Initialize goniometer motor driver",needsInit); gd.addCheckbox("Initialize goniometer motor driver",needsInit);
gd.addNumericField("Debug level", debugLevel, 0,1,"");
gd.showDialog(); gd.showDialog();
if (gd.wasCanceled()) return false; if (gd.wasCanceled()) return false;
String selectedAction=gd.getNextRadioButton(); String selectedAction=gd.getNextRadioButton();
currentTilt= gd.getNextNumber(); currentTilt= gd.getNextNumber();
currentAxial= gd.getNextNumber(); currentAxial= gd.getNextNumber();
needsInit= gd.getNextBoolean(); needsInit= gd.getNextBoolean();
debugLevel=(int)gd.getNextNumber();
this.goniometerParameters.goniometerMotors.debugLevel=this.debugLevel; // +1;
if (needsInit){ if (needsInit){
if (!this.goniometerParameters.goniometerMotors.tryInit(true,updateStatus)){ if (!this.goniometerParameters.goniometerMotors.tryInit(true,updateStatus)){
String msg="Failed to initialize goniometer motor driver"; String msg="Failed to initialize goniometer motor driver";
......
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