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

14
src/main/java/ch/psi/mxsc/MainPanel.java
View File

@@ -277,7 +277,7 @@ public class MainPanel extends Panel {
}
});
samplePopupMenu.add(menuMountSample);
samplePopupMenu.add(menuUnmoountSample);
samplePopupMenu.add(menuUnmoountSample);
}
JMenuItem menuEditSamples;
@@ -454,6 +454,7 @@ public class MainPanel extends Panel {
@Override
public void onStateChange(State state, State former) {
Controller.getInstance().onStateChange(state, former);
updateButtonState();
}
public void setViewCamera(){
@@ -602,10 +603,12 @@ public class MainPanel extends Panel {
}
}
void updateButtonSampleLoadState(){
void updateButtonState(){
boolean doors_open = !Controller.getInstance().isDoorClosed();
boolean cover_pos_detected = isCoverPosDetected();
buttonSampleLoad.setEnabled(doors_open && !cover_pos_detected);
buttonSampleLoad.setEnabled(doors_open && !cover_pos_detected && getState().isInitialized());
buttonCamera.setEnabled(getState().isInitialized());
buttonDrawing.setEnabled(getState().isInitialized());
}
void updatePsysSafety(Object value) {
if ((value == null) || !(value instanceof Boolean)) {
@@ -624,7 +627,7 @@ public class MainPanel extends Panel {
getLogger().log(Level.WARNING, null, ex);
}
}
updateButtonSampleLoadState();
updateButtonState();
}
void updateMode(Object value) {
@@ -1057,7 +1060,7 @@ public class MainPanel extends Panel {
}
}
}
updateButtonSampleLoadState();
updateButtonState();
String text;
try {
List cache = (List)eval("get_cover_location_cache()", true);
@@ -1263,6 +1266,7 @@ public class MainPanel extends Panel {
panelDetection.setBorder(javax.swing.BorderFactory.createTitledBorder("Sample Transfer"));
buttonSampleLoad.setText("Load");
buttonSampleLoad.setEnabled(false);
buttonSampleLoad.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
buttonSampleLoadActionPerformed(evt);