Closedown

This commit is contained in:
gac-x03da
2020-09-29 15:37:04 +02:00
parent 92bca62646
commit e02fa4cc98
6 changed files with 29 additions and 13 deletions

View File

@@ -120,7 +120,7 @@ public class XPSSpectrum extends Panel {
tableChangeListener = new SwingUtils.TableChangeListener(rangeSelectionPanel.getTable()) {
@Override
protected void onTableChange(int row, int column, Object value, Object former) {
if (column == indexEph){
if ((checkCIS.isSelected()) && (column == indexEph)){
try{
if (!isDefined (value)){
value = XPSSpectrum.this.getDevice("Eph").take();
@@ -365,6 +365,7 @@ public class XPSSpectrum extends Panel {
;
buttonAbort = new javax.swing.JButton();
buttonSkip = new javax.swing.JButton();
checkCIS = new javax.swing.JCheckBox();
panelArguments.setBorder(javax.swing.BorderFactory.createTitledBorder("Arguments"));
@@ -591,6 +592,8 @@ public class XPSSpectrum extends Panel {
}
});
checkCIS.setText("Constant Initial State");
javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2);
jPanel2.setLayout(jPanel2Layout);
jPanel2Layout.setHorizontalGroup(
@@ -608,7 +611,9 @@ 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, 13, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(checkCIS)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(buttonSkip)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(buttonAbort))
@@ -626,7 +631,8 @@ public class XPSSpectrum extends Panel {
.addComponent(buttonInitialScan)
.addComponent(buttonDetailedScan)
.addComponent(buttonAbort)
.addComponent(buttonSkip))
.addComponent(buttonSkip)
.addComponent(checkCIS))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(rangeSelectionPanel, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
@@ -794,6 +800,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 checkCIS;
private javax.swing.JCheckBox checkEndScan;
private javax.swing.JCheckBox checkSaveImage;
private javax.swing.JComboBox comboPass;