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

Update scripts and plugins to 2.0

Browse Source
This commit is contained in:
gobbo_a
2025-08-04 12:38:24 +02:00
parent b45d3b4202
commit b631d4c589
44 changed files with 347 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/Beamline.java
View File

@@ -1,10 +1,11 @@
import ch.psi.pshell.core.Context;
import ch.psi.pshell.framework.Context;
import ch.psi.pshell.framework.Panel;
import ch.psi.pshell.sequencer.Interpreter;
import ch.psi.pshell.swing.DeviceValuePanel;
import ch.psi.pshell.ui.Panel;
import ch.psi.utils.Arr;
import ch.psi.utils.State;
import ch.psi.utils.Str;
import ch.psi.utils.swing.SwingUtils;
import ch.psi.pshell.utils.Arr;
import ch.psi.pshell.utils.State;
import ch.psi.pshell.utils.Str;
import ch.psi.pshell.swing.SwingUtils;
import java.awt.Component;
import java.awt.Font;
import java.io.IOException;
@@ -197,13 +198,13 @@ public class Beamline extends Panel {
args.put("CFF", spinnerCff.getValue());
}
void applyBeamline() throws Context.ContextStateException {
void applyBeamline() throws Interpreter.InterpreterStateException {
HashMap args = new HashMap();
setBeamlineArgs(args);
runAsync("templates/SetupBeamline", args).handle((ret, t) -> {
if ((t != null) && (!getContext().isAborted())) {
if ((t != null) && (!Context.isAborted())) {
showException((Exception) t);
}
return t;