From f9e6ad194772b70a643a7e9409acc1c3fbf180ba Mon Sep 17 00:00:00 2001 From: gac-S_Changer Date: Wed, 18 Mar 2026 13:20:56 +0100 Subject: [PATCH] Update PShell --- pom.xml | 2 +- src/main/java/ch/psi/mxsc/Controller.java | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 319e3c1..86a91c0 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 ch.psi MXSC - 2.0.0 + 2.0.1 jar diff --git a/src/main/java/ch/psi/mxsc/Controller.java b/src/main/java/ch/psi/mxsc/Controller.java index 0667538..2ba9ad1 100644 --- a/src/main/java/ch/psi/mxsc/Controller.java +++ b/src/main/java/ch/psi/mxsc/Controller.java @@ -22,6 +22,7 @@ import ch.psi.pshell.utils.Audio; import ch.psi.pshell.utils.Chrono; import ch.psi.pshell.utils.State; import ch.psi.pshell.swing.SwingUtils; +import ch.psi.pshell.utils.State.StateException; import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.event.WindowAdapter; @@ -538,11 +539,11 @@ public class Controller { } } - public void imageDetectPucks() throws Sequencer.StateException { + public void imageDetectPucks() throws StateException { imageDetectPucks(null, null, null); } - public void imageDetectPucks(JComponent plot, JComponent renderer, JComponent text) throws Sequencer.StateException { + public void imageDetectPucks(JComponent plot, JComponent renderer, JComponent text) throws StateException { Map args = new HashMap(); args.put("PLOT", plot); args.put("RENDERER", renderer); @@ -559,7 +560,7 @@ public class Controller { updateView(); } - public void clearImageDetection() throws Sequencer.StateException, ScriptException, IOException, InterruptedException { + public void clearImageDetection() throws StateException, ScriptException, IOException, InterruptedException { Map> map = (Map>) getMainFrame().eval("clear_detection(None)"); setImageDetection(map); } @@ -775,7 +776,7 @@ public class Controller { try { getMainFrame().evalAsync("set_laser_pos(" + ((pos==null) ? "" : ("'" + pos + "'") ) + ")" ,true); getMainFrame().basePlatePanel.pointPuck((pos==null) ? null : basePlate.getPuckByName(pos)); - } catch (Sequencer.StateException ex) { + } catch (StateException ex) { Logger.getLogger(Controller.class.getName()).log(Level.SEVERE, null, ex); } }