pshell_config/dev
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Startup

Browse Source
This commit is contained in:
gobbo_a
2019-11-08 17:12:31 +01:00
parent 0accb6df34
commit cfa4b21aa5
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
plugins/Eiger.java
View File

@@ -51,22 +51,22 @@ public class Eiger extends Panel {
initComponents();
((JSpinner.ListEditor) spinnerHar1.getEditor()).getTextField().setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
((JSpinner.ListEditor) spinnerHar2.getEditor()).getTextField().setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
SwingUtils.setEnumCombo(comboID, State.class);
SwingUtils.setEnumCombo(comboSwitch, Switching.class);
SwingUtils.setEnumCombo(comboPol1, Polarization.class);
SwingUtils.setEnumCombo(comboPol2, Polarization.class);
SwingUtils.setEnumCombo(comboImgPol1, Polarization.class);
SwingUtils.setEnumCombo(comboImgPol2, Polarization.class);
SwingUtils.setEnumCombo(comboImgMethod, ImgMethod.class);
SwingUtils.setEnumCombo(comboID, ID.class, true);
SwingUtils.setEnumCombo(comboSwitch, Switching.class, true);
SwingUtils.setEnumCombo(comboPol1, Polarization.class, true);
SwingUtils.setEnumCombo(comboPol2, Polarization.class, true);
SwingUtils.setEnumCombo(comboImgPol1, Polarization.class, true);
SwingUtils.setEnumCombo(comboImgPol2, Polarization.class, true);
SwingUtils.setEnumCombo(comboImgMethod, ImgMethod.class, true);
Component[] parameterControls = new Component[]{comboID};
/*
for (JPanel panel : new JPanel[]{panelBeamline, panelImgControls, panelSpectrum}){
for (Class cls : new Class[]{ComboBoxModel.class, JSpinner.class, JCheckBox.class}){
parameterControls = Arr.append(parameterControls, SwingUtils.getComponentsByType(panel, cls));
}
}
*/
this.parameterControls = parameterControls;
setPersistedComponents(parameterControls);
}
@@ -119,12 +119,12 @@ public class Eiger extends Panel {
void setBeamlineArgs(HashMap args){
args.put("ID", comboID.getSelectedItem().toString());
args.put("SWITCHING", comboSwitch.getSelectedItem().toString());
args.put("POL_ID_1", comboPol1.getSelectedItem().toString());
args.put("SWITCHING", comboSwitch.getSelectedItem());
args.put("POL_ID_1", comboPol1.getSelectedItem());
args.put("ALPHA_ID_1", spinnerAlp1.getValue());
args.put("HARMONIC_ID_1", spinnerHar1.getValue());
args.put("OFFSET_ID_1", spinnerOff1.getValue());
args.put("POL_ID_2", comboPol2.getSelectedItem().toString());
args.put("POL_ID_2", comboPol2.getSelectedItem());
args.put("ALPHA_ID_2", spinnerAlp2.getValue());
args.put("HARMONIC_ID_2", spinnerHar2.getValue());
args.put("OFFSET_ID_2", spinnerOff2.getValue());
@@ -133,7 +133,7 @@ public class Eiger extends Panel {
void run2Images() throws Context.ContextStateException {
HashMap args = new HashMap();
args.put("METHOD", comboImgMethod.getSelectedItem().toString());
args.put("METHOD", comboImgMethod.getSelectedItem());
args.put("MEASUREMENTS", spinnerImgMeasurements.getValue());
args.put("CONTRAST", spinnerImgContrast.getValue());
args.put("AUTO_SAVE", checkImgAutosave.isSelected());
@@ -141,11 +141,11 @@ public class Eiger extends Panel {
args.put("EXPOSURE_1", spinnerImgExp1.getValue());
args.put("AVERAGE_1", spinnerImgAvg1.getValue());
args.put("ENERGY_1", spinnerImgEng1.getValue());
args.put("POLARIZATION_1", comboImgPol1.getSelectedItem().toString());
args.put("POLARIZATION_1", comboImgPol1.getSelectedItem());
args.put("EXPOSURE_2", spinnerImgExp2.getValue());
args.put("AVERAGE_2", spinnerImgAvg2.getValue());
args.put("ENERGY_2", spinnerImgEng2.getValue());
args.put("POLARIZATION_2", comboImgPol2.getSelectedItem().toString());
args.put("POLARIZATION_2", comboImgPol2.getSelectedItem());
setBeamlineArgs(args);
runAsync("templates/Eiger2Img", args).handle((ret, t) -> {