Closedown

This commit is contained in:
x03daop
2016-06-14 14:24:03 +02:00
parent fb8c175369
commit 8df4c9c215
4 changed files with 55 additions and 10 deletions

View File

@@ -128,6 +128,7 @@ public class XPSSpectrum extends Panel {
valueIterations.setEnabled(value);
comboPass.setEnabled(value);
checkEndScan.setEnabled(value);
checkSaveImage.setEnabled(value);
updateButtons();
}
@@ -191,7 +192,8 @@ public class XPSSpectrum extends Panel {
void start() throws Controller.ControllerStateException{
HashMap<String, Object> args = new HashMap<>();
args.put("ranges", scanRanges);
args.put("pass_energy", Integer.valueOf(comboPass.getSelectedItem().toString()));
args.put("pass_energy", Integer.valueOf(comboPass.getSelectedItem().toString()));
args.put("save_scienta_image", checkSaveImage.isSelected());
args.put("ENDSCAN", checkEndScan.isSelected());
currentScanIndex = -1;
@@ -220,6 +222,7 @@ public class XPSSpectrum extends Panel {
jLabel17 = new javax.swing.JLabel();
buttonScientaSetup = new javax.swing.JButton();
checkEndScan = new javax.swing.JCheckBox();
checkSaveImage = new javax.swing.JCheckBox();
jPanel2 = new javax.swing.JPanel();
btLoad = new javax.swing.JButton();
btSave = new javax.swing.JButton();
@@ -300,6 +303,8 @@ public class XPSSpectrum extends Panel {
checkEndScan.setText("Turn off beam at end");
checkSaveImage.setText("Save Scienta image");
javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
jPanel1.setLayout(jPanel1Layout);
jPanel1Layout.setHorizontalGroup(
@@ -332,7 +337,8 @@ public class XPSSpectrum extends Panel {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(valueIterations, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addComponent(buttonScientaSetup, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(checkEndScan))
.addComponent(checkEndScan)
.addComponent(checkSaveImage))
.addContainerGap())
);
@@ -369,6 +375,8 @@ public class XPSSpectrum extends Panel {
.addComponent(comboPass, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(18, 18, Short.MAX_VALUE)
.addComponent(checkEndScan)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(checkSaveImage)
.addGap(18, 18, 18)
.addComponent(buttonScientaSetup)
.addGap(26, 26, 26))
@@ -457,7 +465,7 @@ public class XPSSpectrum extends Panel {
.addComponent(buttonAbort)
.addComponent(buttonSkip))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(rangeSelectionPanel, javax.swing.GroupLayout.DEFAULT_SIZE, 230, Short.MAX_VALUE)
.addComponent(rangeSelectionPanel, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(btLoad, javax.swing.GroupLayout.Alignment.TRAILING)
@@ -609,6 +617,7 @@ public class XPSSpectrum extends Panel {
private javax.swing.JButton buttonScientaSetup;
private javax.swing.JButton buttonSkip;
private javax.swing.JCheckBox checkEndScan;
private javax.swing.JCheckBox checkSaveImage;
private javax.swing.JComboBox comboPass;
private javax.swing.JLabel jLabel1;
private javax.swing.JLabel jLabel11;