pshell/MXSC
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update PShell

Browse Source
This commit is contained in:
gac-S_Changer
2026-03-18 13:20:56 +01:00
parent 0031959230
commit f9e6ad1947
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/ch/psi/mxsc/Controller.java
+5 -4
View File
@@ -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<String, List<String>> map = (Map<String, List<String>>) 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);
}
}