Closedown
This commit is contained in:
@@ -191,6 +191,7 @@ public class XPSSpectrum extends Panel {
|
||||
HashMap<String, Object> args = new HashMap<>();
|
||||
args.put("ranges", scanRanges);
|
||||
args.put("pass_energy", Integer.valueOf(comboPass.getSelectedItem().toString()));
|
||||
args.put("ENDSCAN", checkEndScan.isSelected());
|
||||
|
||||
currentScanIndex = -1;
|
||||
runAsync("XPSSpectrum", args);
|
||||
@@ -233,6 +234,7 @@ public class XPSSpectrum extends Panel {
|
||||
;
|
||||
buttonAbort = new javax.swing.JButton();
|
||||
buttonSkip = new javax.swing.JButton();
|
||||
checkEndScan = new javax.swing.JCheckBox();
|
||||
|
||||
jPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder("Arguments"));
|
||||
|
||||
@@ -409,6 +411,8 @@ public class XPSSpectrum extends Panel {
|
||||
}
|
||||
});
|
||||
|
||||
checkEndScan.setText("Turn off beam at end");
|
||||
|
||||
javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2);
|
||||
jPanel2.setLayout(jPanel2Layout);
|
||||
jPanel2Layout.setHorizontalGroup(
|
||||
@@ -417,7 +421,8 @@ public class XPSSpectrum extends Panel {
|
||||
.addContainerGap()
|
||||
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
|
||||
.addGroup(jPanel2Layout.createSequentialGroup()
|
||||
.addGap(342, 351, Short.MAX_VALUE)
|
||||
.addComponent(checkEndScan)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(btLoad)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.addComponent(btSave))
|
||||
@@ -426,7 +431,7 @@ public class XPSSpectrum extends Panel {
|
||||
.addComponent(buttonInitialScan)
|
||||
.addGap(18, 18, 18)
|
||||
.addComponent(buttonDetailedScan, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 117, Short.MAX_VALUE)
|
||||
.addComponent(buttonSkip)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(buttonAbort))
|
||||
@@ -449,7 +454,9 @@ public class XPSSpectrum extends Panel {
|
||||
.addComponent(rangeSelectionPanel, javax.swing.GroupLayout.DEFAULT_SIZE, 168, Short.MAX_VALUE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(btLoad, javax.swing.GroupLayout.Alignment.TRAILING)
|
||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||
.addComponent(btLoad)
|
||||
.addComponent(checkEndScan))
|
||||
.addComponent(btSave, javax.swing.GroupLayout.Alignment.TRAILING))
|
||||
.addContainerGap())
|
||||
);
|
||||
@@ -597,6 +604,7 @@ public class XPSSpectrum extends Panel {
|
||||
private javax.swing.JButton buttonInitialScan;
|
||||
private javax.swing.JButton buttonScientaSetup;
|
||||
private javax.swing.JButton buttonSkip;
|
||||
private javax.swing.JCheckBox checkEndScan;
|
||||
private javax.swing.JComboBox comboPass;
|
||||
private javax.swing.JLabel jLabel1;
|
||||
private javax.swing.JLabel jLabel11;
|
||||
|
||||
Reference in New Issue
Block a user