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

Puck detection dialog is maximized

Browse Source
This commit is contained in:
gac-S_Changer
2026-03-25 11:28:53 +01:00
parent c86f65475b
commit 0f7a5d803a
2 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/ch/psi/mxsc/PuckLoadingDialog.java
+33 -6
View File
@@ -6,6 +6,7 @@ import ch.psi.pshell.framework.Setup;
import ch.psi.pshell.swing.SwingUtils;
import java.awt.Dimension;
import java.awt.Rectangle;
import java.awt.event.MouseEvent;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Arrays;
@@ -248,6 +249,32 @@ public class PuckLoadingDialog extends JDialog {
}
}
}
void pointPuck(Puck puck){
if (puck!=null) {
Controller.getInstance().setLaserPos(puck);
} else {
Controller.getInstance().setLaserPos((Puck)null);
}
}
void onSelected(Puck puck){
try {
pointPuck(puck);
for (int row=0; row< model.getRowCount(); row++){
String position = String.valueOf(table.getValueAt(row, INDEX_POSITION));
if ((position!=null) && (!position.isBlank())){
Puck p = Controller.getInstance().getPuck(position);
if (puck.equals(p)){
table.setRowSelectionInterval(row, row);
return;
}
}
}
table.clearSelection();
} catch (Exception ex) {
SwingUtils.showException(this, ex);
}
}
void makeVisible(Puck puck){
if (puck!=null){
@@ -283,7 +310,11 @@ public class PuckLoadingDialog extends JDialog {
jLabel1 = new javax.swing.JLabel();
labelSuggestion = new javax.swing.JLabel();
jLabel2 = new javax.swing.JLabel();
basePlatePanel = new ch.psi.mxsc.BasePlatePanel();
basePlatePanel = new ch.psi.mxsc.BasePlatePanel(){
void onPuckPressed(MouseEvent e, Puck puck){
onSelected(puck);
}
};
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
@@ -487,11 +518,7 @@ public class PuckLoadingDialog extends JDialog {
String position = (row >= 0) ? String.valueOf(table.getValueAt(row, INDEX_POSITION)) : null;
if ((position!=null) && (!position.isBlank())){
Puck puck = Controller.getInstance().getPuck(position);
if (puck!=null) {
Controller.getInstance().setLaserPos(puck);
} else {
Controller.getInstance().setLaserPos((Puck)null);
}
pointPuck(puck);
}
} catch (Exception ex) {
SwingUtils.showException(this, ex);