Closedown
This commit is contained in:
@@ -84,6 +84,7 @@ public class ManipulatorScan extends Panel {
|
||||
}
|
||||
args.put("LATENCY", (Double) spinnerLatency.getValue());
|
||||
args.put("RELATIVE", radioRelative.isSelected());
|
||||
args.put("ENDSCAN", checkEndScan.isSelected());
|
||||
|
||||
runAsync("ManipulatorScan", args);
|
||||
|
||||
@@ -168,6 +169,7 @@ public class ManipulatorScan extends Panel {
|
||||
jPanel3 = new javax.swing.JPanel();
|
||||
buttonStart = new javax.swing.JButton();
|
||||
buttonAbort = new javax.swing.JButton();
|
||||
checkEndScan = new javax.swing.JCheckBox();
|
||||
|
||||
panelPositioner.setBorder(javax.swing.BorderFactory.createTitledBorder("Positioner"));
|
||||
|
||||
@@ -405,22 +407,19 @@ public class ManipulatorScan extends Panel {
|
||||
.addContainerGap()
|
||||
.addGroup(panelSensorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(buttonScientaSetup, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addGroup(panelSensorsLayout.createSequentialGroup()
|
||||
.addGroup(panelSensorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(checkImage)
|
||||
.addComponent(checkImageIntegration)
|
||||
.addComponent(checkSpectrum)
|
||||
.addComponent(checkCounts1)
|
||||
.addComponent(checkTotalCount)
|
||||
.addComponent(checkCounts2)
|
||||
.addComponent(checkCounts3)
|
||||
.addComponent(checkCounts4)
|
||||
.addComponent(checkCurrent)
|
||||
.addComponent(checkCur1)
|
||||
.addComponent(checkCur2)
|
||||
.addComponent(checkCur3)
|
||||
.addComponent(checkAngleDistribution))
|
||||
.addGap(0, 0, 0)))
|
||||
.addComponent(checkImage)
|
||||
.addComponent(checkImageIntegration)
|
||||
.addComponent(checkSpectrum)
|
||||
.addComponent(checkCounts1)
|
||||
.addComponent(checkTotalCount)
|
||||
.addComponent(checkCounts2)
|
||||
.addComponent(checkCounts3)
|
||||
.addComponent(checkCounts4)
|
||||
.addComponent(checkCurrent)
|
||||
.addComponent(checkCur1)
|
||||
.addComponent(checkCur2)
|
||||
.addComponent(checkCur3)
|
||||
.addComponent(checkAngleDistribution))
|
||||
.addContainerGap())
|
||||
);
|
||||
panelSensorsLayout.setVerticalGroup(
|
||||
@@ -473,6 +472,8 @@ public class ManipulatorScan extends Panel {
|
||||
}
|
||||
});
|
||||
|
||||
checkEndScan.setText("Turn off beam at end");
|
||||
|
||||
javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3);
|
||||
jPanel3.setLayout(jPanel3Layout);
|
||||
jPanel3Layout.setHorizontalGroup(
|
||||
@@ -481,7 +482,10 @@ public class ManipulatorScan extends Panel {
|
||||
.addContainerGap()
|
||||
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(buttonStart, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(buttonAbort, javax.swing.GroupLayout.DEFAULT_SIZE, 212, Short.MAX_VALUE))
|
||||
.addComponent(buttonAbort, javax.swing.GroupLayout.DEFAULT_SIZE, 212, Short.MAX_VALUE)
|
||||
.addGroup(jPanel3Layout.createSequentialGroup()
|
||||
.addComponent(checkEndScan)
|
||||
.addGap(0, 0, Short.MAX_VALUE)))
|
||||
.addContainerGap())
|
||||
);
|
||||
jPanel3Layout.setVerticalGroup(
|
||||
@@ -491,7 +495,9 @@ public class ManipulatorScan extends Panel {
|
||||
.addComponent(buttonStart)
|
||||
.addGap(18, 18, 18)
|
||||
.addComponent(buttonAbort)
|
||||
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(checkEndScan)
|
||||
.addContainerGap())
|
||||
);
|
||||
|
||||
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
|
||||
@@ -584,6 +590,7 @@ public class ManipulatorScan extends Panel {
|
||||
private javax.swing.JCheckBox checkCur2;
|
||||
private javax.swing.JCheckBox checkCur3;
|
||||
private javax.swing.JCheckBox checkCurrent;
|
||||
private javax.swing.JCheckBox checkEndScan;
|
||||
private javax.swing.JCheckBox checkImage;
|
||||
private javax.swing.JCheckBox checkImageIntegration;
|
||||
private javax.swing.JCheckBox checkSpectrum;
|
||||
|
||||
Reference in New Issue
Block a user