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

Laser indicating loaded pucks

Browse Source
This commit is contained in:
gac-S_Changer
2024-12-05 15:20:03 +01:00
parent 2062b4ba1d
commit 31d3ceee2b
4 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/ch/psi/mxsc/PuckLoadingDialog.java
+8 -3
View File
@@ -92,9 +92,14 @@ public class PuckLoadingDialog extends JDialog {
textScannedDatamatrix.setText((datamatrix == null) ? "" : datamatrix.trim());
if ((datamatrix != null) && (!datamatrix.isEmpty())){
setStatusLabel("Scanned puck " + datamatrix, 5000);
makeVisible(datamatrix);
Puck puck = Controller.getInstance().getFreePuck();
Controller.getInstance().setLaserPos(puck.getName());
makeVisible(datamatrix);
String loadedPuck = Controller.getInstance().getPuckFromDatamatrix(datamatrix);
if ((loadedPuck!=null) && !loadedPuck.isBlank()){
Controller.getInstance().setLaserPos(loadedPuck);
} else {
Puck puck = Controller.getInstance().getFreePuck();
Controller.getInstance().setLaserPos(puck.getName());
}
} else {
setStatusLabel(null, -1);
Controller.getInstance().setLaserPos((Puck)null);