This commit is contained in:
gac-x11ma
@@ -49,6 +49,11 @@ public class Eiger extends Panel {
|
||||
Tune_Detune
|
||||
}
|
||||
|
||||
public enum Sequence {
|
||||
A,
|
||||
B
|
||||
}
|
||||
|
||||
public enum SingleSwitching {
|
||||
Normal
|
||||
}
|
||||
@@ -76,6 +81,8 @@ public class Eiger extends Panel {
|
||||
initComponents();
|
||||
SwingUtils.setEnumCombo(comboSwitch, Switching.class, true);
|
||||
comboSwitch.setSelectedIndex(1);
|
||||
SwingUtils.setEnumCombo(comboSeq, Sequence.class, true);
|
||||
comboSeq.setSelectedIndex(0);
|
||||
SwingUtils.setEnumCombo(comboImgMethod, ImgMethod.class, true);
|
||||
|
||||
Component[] parameterControls = new Component[0];
|
||||
@@ -173,12 +180,14 @@ public class Eiger extends Panel {
|
||||
|
||||
if (editable) {
|
||||
comboSwitch.setEnabled(comboImgMethod.getSelectedItem() == ImgMethod.Two_Pol.toString());
|
||||
comboSeq.setEnabled(comboImgMethod.getSelectedItem() == ImgMethod.Two_Pol.toString());
|
||||
}
|
||||
|
||||
labelImgEng1.setVisible(comboImgMethod.getSelectedItem() == ImgMethod.Two_Energies.toString());
|
||||
labelImgEng2.setVisible(comboImgMethod.getSelectedItem() == ImgMethod.Two_Energies.toString());
|
||||
spinnerImgEng1.setVisible(comboImgMethod.getSelectedItem() == ImgMethod.Two_Energies.toString());
|
||||
spinnerImgEng2.setVisible(comboImgMethod.getSelectedItem() == ImgMethod.Two_Energies.toString());
|
||||
spinnerImgEng1.setVisible(comboImgMethod.getSelectedItem() == ImgMethod.Two_Energies.toString());
|
||||
checkSwitchPol.setVisible(comboImgMethod.getSelectedItem() == ImgMethod.Take_Image.toString());
|
||||
|
||||
//panelSecondImage.setVisible(comboImgMethod.getSelectedItem() != ImgMethod.Take_Image.toString());
|
||||
|
||||
@@ -307,12 +316,14 @@ public class Eiger extends Panel {
|
||||
HashMap args = new HashMap();
|
||||
args.put("METHOD", comboImgMethod.getSelectedItem());
|
||||
args.put("SWITCHING", comboSwitch.getSelectedItem());
|
||||
args.put("SEQUENCE", comboSeq.getSelectedItem());
|
||||
args.put("MEASUREMENTS", spinnerImgMeasurements.getValue());
|
||||
args.put("AUTO_SAVE", checkImgAutosave.isSelected());
|
||||
args.put("EXPOSURE", spinnerImgExp.getValue());
|
||||
args.put("AVERAGE", spinnerImgAvg.getValue());
|
||||
args.put("ENERGY_1", spinnerImgEng1.getValue());
|
||||
args.put("ENERGY_2", spinnerImgEng2.getValue());
|
||||
args.put("SWITCH_POL", checkSwitchPol.isSelected());
|
||||
|
||||
runAsync("templates/Eiger2Img", args).handle((ret, t) -> {
|
||||
if ((t != null) && (!getContext().isAborted())) {
|
||||
@@ -450,9 +461,12 @@ public class Eiger extends Panel {
|
||||
jLabel9 = new javax.swing.JLabel();
|
||||
spinnerImgAvg = new javax.swing.JSpinner();
|
||||
labelImgEng2 = new javax.swing.JLabel();
|
||||
spinnerImgEng2 = new javax.swing.JSpinner();
|
||||
spinnerImgEng1 = new javax.swing.JSpinner();
|
||||
spinnerImgEng2 = new javax.swing.JSpinner();
|
||||
labelImgEng1 = new javax.swing.JLabel();
|
||||
labelSwitching1 = new javax.swing.JLabel();
|
||||
comboSeq = new javax.swing.JComboBox<>();
|
||||
checkSwitchPol = new javax.swing.JCheckBox();
|
||||
jPanel9 = new javax.swing.JPanel();
|
||||
dvpEnergya3 = new ch.psi.pshell.swing.DeviceValuePanel();
|
||||
dvpOffID1b = new ch.psi.pshell.swing.DeviceValuePanel();
|
||||
@@ -899,13 +913,19 @@ public class Eiger extends Panel {
|
||||
labelImgEng2.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
|
||||
labelImgEng2.setText("Energy 1:");
|
||||
|
||||
spinnerImgEng2.setModel(new javax.swing.SpinnerNumberModel(1000.0d, 90.0d, 2000.0d, 1.0d));
|
||||
|
||||
spinnerImgEng1.setModel(new javax.swing.SpinnerNumberModel(1000.0d, 90.0d, 2000.0d, 1.0d));
|
||||
|
||||
spinnerImgEng2.setModel(new javax.swing.SpinnerNumberModel(1000.0d, 90.0d, 2000.0d, 1.0d));
|
||||
|
||||
labelImgEng1.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
|
||||
labelImgEng1.setText("Energy 2:");
|
||||
|
||||
labelSwitching1.setText("Sequence:");
|
||||
|
||||
comboSeq.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
|
||||
|
||||
checkSwitchPol.setText("Switch pol after scan");
|
||||
|
||||
javax.swing.GroupLayout jPanel5Layout = new javax.swing.GroupLayout(jPanel5);
|
||||
jPanel5.setLayout(jPanel5Layout);
|
||||
jPanel5Layout.setHorizontalGroup(
|
||||
@@ -917,12 +937,14 @@ public class Eiger extends Panel {
|
||||
.addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(jLabel20, javax.swing.GroupLayout.Alignment.TRAILING)
|
||||
.addComponent(jLabel21, javax.swing.GroupLayout.Alignment.TRAILING)
|
||||
.addComponent(labelSwitching, javax.swing.GroupLayout.Alignment.TRAILING))
|
||||
.addComponent(labelSwitching, javax.swing.GroupLayout.Alignment.TRAILING)
|
||||
.addComponent(labelSwitching1, javax.swing.GroupLayout.Alignment.TRAILING))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(comboSwitch, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(spinnerImgMeasurements)
|
||||
.addComponent(comboImgMethod, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
|
||||
.addComponent(comboImgMethod, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(comboSeq, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
|
||||
.addGroup(jPanel5Layout.createSequentialGroup()
|
||||
.addGap(118, 118, 118)
|
||||
.addComponent(checkImgAutosave, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
|
||||
@@ -932,22 +954,27 @@ public class Eiger extends Panel {
|
||||
.addComponent(jLabel4, javax.swing.GroupLayout.Alignment.TRAILING))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(spinnerImgAvg, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(spinnerImgExp, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addGap(18, 62, Short.MAX_VALUE)
|
||||
.addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(labelImgEng1, javax.swing.GroupLayout.Alignment.TRAILING)
|
||||
.addComponent(labelImgEng2, javax.swing.GroupLayout.Alignment.TRAILING))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(spinnerImgEng2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(spinnerImgEng1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addGroup(jPanel5Layout.createSequentialGroup()
|
||||
.addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(spinnerImgAvg, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(spinnerImgExp, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addGap(18, 62, Short.MAX_VALUE)
|
||||
.addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(labelImgEng1, javax.swing.GroupLayout.Alignment.TRAILING)
|
||||
.addComponent(labelImgEng2, javax.swing.GroupLayout.Alignment.TRAILING))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(spinnerImgEng1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(spinnerImgEng2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
|
||||
.addGroup(jPanel5Layout.createSequentialGroup()
|
||||
.addComponent(checkSwitchPol)
|
||||
.addGap(0, 0, Short.MAX_VALUE)))
|
||||
.addContainerGap())
|
||||
);
|
||||
|
||||
jPanel5Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {spinnerImgAvg, spinnerImgEng1, spinnerImgEng2, spinnerImgExp});
|
||||
|
||||
jPanel5Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {checkImgAutosave, comboImgMethod, comboSwitch, spinnerImgMeasurements});
|
||||
jPanel5Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {checkImgAutosave, comboImgMethod, comboSeq, comboSwitch, spinnerImgMeasurements});
|
||||
|
||||
jPanel5Layout.setVerticalGroup(
|
||||
jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
@@ -957,11 +984,11 @@ public class Eiger extends Panel {
|
||||
.addGroup(jPanel5Layout.createSequentialGroup()
|
||||
.addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||
.addComponent(labelImgEng2)
|
||||
.addComponent(spinnerImgEng2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addComponent(spinnerImgEng1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
|
||||
.addComponent(labelImgEng1)
|
||||
.addComponent(spinnerImgEng1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
|
||||
.addComponent(spinnerImgEng2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
|
||||
.addGroup(jPanel5Layout.createSequentialGroup()
|
||||
.addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||
.addComponent(comboImgMethod, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
@@ -977,7 +1004,12 @@ public class Eiger extends Panel {
|
||||
.addGap(6, 6, 6)
|
||||
.addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||
.addComponent(labelSwitching)
|
||||
.addComponent(comboSwitch, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addComponent(comboSwitch, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(checkSwitchPol))
|
||||
.addGap(6, 6, 6)
|
||||
.addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||
.addComponent(labelSwitching1)
|
||||
.addComponent(comboSeq, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.addComponent(checkImgAutosave)
|
||||
.addContainerGap(17, Short.MAX_VALUE))
|
||||
@@ -1102,13 +1134,13 @@ public class Eiger extends Panel {
|
||||
.addGroup(jPanel2Layout.createSequentialGroup()
|
||||
.addContainerGap()
|
||||
.addComponent(panelImgControls, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addGap(18, 41, Short.MAX_VALUE)
|
||||
.addGap(18, 31, Short.MAX_VALUE)
|
||||
.addComponent(jPanel9, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED, 42, Short.MAX_VALUE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED, 32, Short.MAX_VALUE)
|
||||
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||
.addComponent(buttonImgStart)
|
||||
.addComponent(buttonImgAbort))
|
||||
.addContainerGap(65, Short.MAX_VALUE))
|
||||
.addContainerGap(55, Short.MAX_VALUE))
|
||||
);
|
||||
|
||||
jTabbedPane1.addTab("2-Images", jPanel2);
|
||||
@@ -1733,7 +1765,9 @@ public class Eiger extends Panel {
|
||||
private javax.swing.JCheckBox checkSpecSaveSpectrum;
|
||||
private javax.swing.JCheckBox checkSpecSwitchPol;
|
||||
private javax.swing.JCheckBox checkSpecWithI0;
|
||||
private javax.swing.JCheckBox checkSwitchPol;
|
||||
private javax.swing.JComboBox<String> comboImgMethod;
|
||||
private javax.swing.JComboBox<String> comboSeq;
|
||||
private javax.swing.JComboBox<String> comboSwitch;
|
||||
private ch.psi.pshell.swing.DeviceValuePanel deviceValuePanel10;
|
||||
private ch.psi.pshell.swing.DeviceValuePanel deviceValuePanel11;
|
||||
@@ -1801,6 +1835,7 @@ public class Eiger extends Panel {
|
||||
private javax.swing.JLabel labelOffID2a;
|
||||
private javax.swing.JLabel labelOffID2b;
|
||||
private javax.swing.JLabel labelSwitching;
|
||||
private javax.swing.JLabel labelSwitching1;
|
||||
private javax.swing.JPanel panelImgControls;
|
||||
private javax.swing.JPanel panelNorm;
|
||||
private javax.swing.JPanel panelNorm1;
|
||||
|
||||
Reference in New Issue
Block a user