This commit is contained in:
X11MA
2016-08-17 14:51:10 +02:00
parent b4afba6699
commit 1ed5a5980a
8 changed files with 365 additions and 55 deletions

View File

@@ -89,13 +89,13 @@ public class DelayScan extends Panel {
args.put("DELAY", (Double) spinnerDelay.getValue());
args.put("END", (Double) spinnerEnd.getValue());
args.put("FINEDELAY", (Double) spinnerFineDelay.getValue());
args.put("SIZE", (Double) spinnerSize.getValue());
args.put("STEP", (Double) spinnerSize.getValue());
args.put("OFFSET1", (Double) spinnerOffset1.getValue());
args.put("OFFSET2", (Double) spinnerOffset2.getValue());
args.put("ACQTIME", (Double) spinnerAcqTime.getValue());
args.put("ENERGIES", jTextField1.getText());
args.put("RUNTYPE", comboRunType.getSelectedItem().toString());
args.put("ROUNDS", (Double) spinnerRounds.getValue());
args.put("ROUNDS", (Integer) spinnerRounds.getValue());
args.put("SET_OFFSETS", jCheckBox1.isSelected() ? 1 : 2);
args.put("ID1", jRadioButton1.isSelected() ? 1 : 2);
args.put("ID2", jRadioButton2.isSelected() ? 1 : 2);
@@ -105,7 +105,7 @@ public class DelayScan extends Panel {
args.put("Cam_end", (Double) jSpinner2.getValue());
args.put("Save_array_data", jCheckBox4.isSelected() ? 1 : 2);
args.put("PATH", jTextField2.getText());
buttonAbort.setEnabled(true);
runAsync("DelayScan", args).handle((ok, ex) -> {
@@ -179,7 +179,6 @@ public class DelayScan extends Panel {
jLabel1.setText("Delay start (ns):");
spinnerStart.setModel(new javax.swing.SpinnerNumberModel(Double.valueOf(0.0d), null, null, Double.valueOf(1.0d)));
spinnerStart.setValue(0);
jLabel2.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
jLabel2.setText("LPP delay at t=0");
@@ -189,8 +188,7 @@ public class DelayScan extends Panel {
jLabel3.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
jLabel3.setText("Delay end (ns):");
spinnerEnd.setModel(new javax.swing.SpinnerNumberModel(Double.valueOf(0.0d), null, null, Double.valueOf(1.0d)));
spinnerEnd.setValue(50);
spinnerEnd.setModel(new javax.swing.SpinnerNumberModel(Double.valueOf(50.0d), null, null, Double.valueOf(1.0d)));
jLabel4.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
jLabel4.setText("LPP fine delay at t=0");
@@ -200,8 +198,7 @@ public class DelayScan extends Panel {
jLabel8.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
jLabel8.setText("Step size (ns):");
spinnerSize.setModel(new javax.swing.SpinnerNumberModel(Double.valueOf(0.0d), null, null, Double.valueOf(1.0d)));
spinnerSize.setValue(1);
spinnerSize.setModel(new javax.swing.SpinnerNumberModel(Double.valueOf(1.0d), null, null, Double.valueOf(1.0d)));
jLabel13.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
jLabel13.setText("Offset2:");
@@ -223,7 +220,7 @@ public class DelayScan extends Panel {
comboRunType.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "+/-", "+,-", "+", "-", "LH/LV", "LH,LV", "LH", "LV" }));
spinnerRounds.setModel(new javax.swing.SpinnerNumberModel(1.0d, 1.0d, 10.0d, 1.0d));
spinnerRounds.setModel(new javax.swing.SpinnerNumberModel(1, 1, 10, 1));
jLabel5.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
jLabel5.setText("Nb of repetitions:");
@@ -475,7 +472,12 @@ public class DelayScan extends Panel {
jLabel10.setText("Saving path");
jTextField2.setText("X:\\public");
jTextField2.setText("/sls/X11MA/data/X11MA/Desktop/");
jTextField2.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
jTextField2ActionPerformed(evt);
}
});
javax.swing.GroupLayout panelSetupLayout = new javax.swing.GroupLayout(panelSetup);
panelSetup.setLayout(panelSetupLayout);
@@ -547,6 +549,10 @@ public class DelayScan extends Panel {
// TODO add your handling code here:
}//GEN-LAST:event_jTextField1ActionPerformed
private void jTextField2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jTextField2ActionPerformed
// TODO add your handling code here:
}//GEN-LAST:event_jTextField2ActionPerformed
EditorDialog dlgConfig;
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton buttonAbort;