This commit is contained in:
gac-x11ma
2023-07-18 11:00:54 +02:00
parent 8488d81c80
commit 1d75bc4535
77 changed files with 2464 additions and 253 deletions

26
plugins/DataAcquisition.java Executable file → Normal file
View File

@@ -10,7 +10,7 @@ import ch.psi.pshell.ui.Panel;
import ch.psi.utils.Arr;
import ch.psi.utils.IO;
import ch.psi.utils.Serializer;
import ch.psi.utils.State;
import ch.psi.utils.State;
import ch.psi.utils.Str;
import ch.psi.utils.swing.SwingUtils;
@@ -204,7 +204,11 @@ public class DataAcquisition extends Panel {
}
Rect imagingRoiOverlay;
return (Rectangle) getGlobalVar("IMAGING_ROI");
Rectangle getImagingRoi(){
try{
return (Rectangle) getGlobalVar("IMAGING_ROI");
} catch (Exception ex){
return null;
}
}
@@ -959,6 +963,11 @@ public class DataAcquisition extends Panel {
panelImgControls.setBorder(javax.swing.BorderFactory.createTitledBorder("Parameters"));
checkImgAutosave.setSelected(true);
checkImgAutosave.setText("Autosave");
checkImgAutosave.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
checkImgAutosaveActionPerformed(evt);
}
});
jLabel20.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
@@ -1177,6 +1186,11 @@ public class DataAcquisition extends Panel {
spinnerSpecExp.setModel(new javax.swing.SpinnerNumberModel(1.0d, 0.0d, 3600.0d, 1.0d));
checkSpecWithI0.setSelected(true);
checkSpecWithI0.setText("With I0");
checkSpecWithI0.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
checkSpecWithI0ActionPerformed(evt);
}
});
checkSpecSaveSpectrum.setSelected(true);
@@ -1815,6 +1829,14 @@ public class DataAcquisition extends Panel {
getLogger().log(Level.SEVERE, null, ex);
}
}//GEN-LAST:event_buttonImgOTFAbortActionPerformed
private void checkImgAutosaveActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_checkImgAutosaveActionPerformed
// TODO add your handling code here:
}//GEN-LAST:event_checkImgAutosaveActionPerformed
private void checkSpecWithI0ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_checkSpecWithI0ActionPerformed
// TODO add your handling code here:
}//GEN-LAST:event_checkSpecWithI0ActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton buttonAdd;