This commit is contained in:
gac-x11ma
2022-11-22 16:38:37 +01:00
parent 2ff79ee1c5
commit ea61419b20
63 changed files with 1204 additions and 64 deletions

View File

@@ -391,6 +391,7 @@ public class DataAcquisition extends Panel {
HashMap args = new HashMap();
args.put("SAVE_SPECTRUM", checkSpecSaveSpectrum.isSelected());
args.put("SAVE_IMAGES", checkSpecSaveImages.isSelected());
args.put("DRIFT_CORRECTION", checkDriftCorrectionSpec.isSelected());
args.put("WITH_I0", checkSpecWithI0.isSelected());
args.put("SWITCH_POL", checkSpecSwitchPol.isSelected());
args.put("EXPOSURE", spinnerSpecExp.getValue());
@@ -563,6 +564,7 @@ public class DataAcquisition extends Panel {
buttonClear = new javax.swing.JButton();
buttonSpecStart = new javax.swing.JButton();
buttonSpecAbort = new javax.swing.JButton();
checkDriftCorrectionSpec = new javax.swing.JCheckBox();
jPanel6 = new javax.swing.JPanel();
panelParameters1 = new javax.swing.JPanel();
jLabel6 = new javax.swing.JLabel();
@@ -1256,6 +1258,8 @@ public class DataAcquisition extends Panel {
}
});
checkDriftCorrectionSpec.setText("Drift correction");
javax.swing.GroupLayout panelSpectrumLayout = new javax.swing.GroupLayout(panelSpectrum);
panelSpectrum.setLayout(panelSpectrumLayout);
panelSpectrumLayout.setHorizontalGroup(
@@ -1287,7 +1291,8 @@ public class DataAcquisition extends Panel {
.addGroup(panelSpectrumLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(checkSpecSaveSpectrum)
.addComponent(checkSpecSaveImages)
.addComponent(checkSpecWithI0))
.addComponent(checkSpecWithI0)
.addComponent(checkDriftCorrectionSpec))
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
@@ -1308,6 +1313,8 @@ public class DataAcquisition extends Panel {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(checkSpecSaveImages)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(checkDriftCorrectionSpec)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(checkSpecWithI0)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addGroup(panelSpectrumLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
@@ -1473,11 +1480,11 @@ public class DataAcquisition extends Panel {
.addGroup(jPanel3Layout.createSequentialGroup()
.addContainerGap()
.addComponent(panelSpectrum, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(57, 57, 57)
.addGap(18, 18, 18)
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(jPanel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(panelParameters1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(0, 40, Short.MAX_VALUE))
.addGap(0, 55, Short.MAX_VALUE))
);
jTabbedPane1.addTab("Absorption Spectrum", jPanel3);
@@ -1789,6 +1796,7 @@ public class DataAcquisition extends Panel {
private javax.swing.JButton buttonSpecAbort;
private javax.swing.JButton buttonSpecStart;
private javax.swing.JCheckBox checkDriftCorrection;
private javax.swing.JCheckBox checkDriftCorrectionSpec;
private javax.swing.JCheckBox checkImgAutosave;
private javax.swing.JCheckBox checkImgOTFSaveImages;
private javax.swing.JCheckBox checkSpecSaveImages;