From c7ceebb211802f37e2f45800f8961568a33c1a17 Mon Sep 17 00:00:00 2001 From: gac-S_Changer Date: Thu, 5 Dec 2024 13:11:36 +0100 Subject: [PATCH] MAnaging state of puck load button --- src/main/java/ch/psi/mxsc/Controller.java | 2 +- src/main/java/ch/psi/mxsc/MainPanel.java | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/main/java/ch/psi/mxsc/Controller.java b/src/main/java/ch/psi/mxsc/Controller.java index 579390d..6059de3 100644 --- a/src/main/java/ch/psi/mxsc/Controller.java +++ b/src/main/java/ch/psi/mxsc/Controller.java @@ -460,7 +460,7 @@ public class Controller { } catch (Exception ex) { return null; } - } + } public void setServiceMode(boolean value){ try{ diff --git a/src/main/java/ch/psi/mxsc/MainPanel.java b/src/main/java/ch/psi/mxsc/MainPanel.java index 4fbf921..607eaf8 100644 --- a/src/main/java/ch/psi/mxsc/MainPanel.java +++ b/src/main/java/ch/psi/mxsc/MainPanel.java @@ -594,6 +594,19 @@ public class MainPanel extends Panel { } } + public boolean isCoverPosDetected(){ + try{ + return textCoverDet.getText().contains(", "); + } catch(Exception ex){ + return false; + } + } + + void updateButtonSampleLoadState(){ + boolean doors_open = !Controller.getInstance().isDoorClosed(); + boolean cover_pos_detected = isCoverPosDetected(); + buttonSampleLoad.setEnabled(doors_open && !cover_pos_detected); + } void updatePsysSafety(Object value) { if ((value == null) || !(value instanceof Boolean)) { ledPsysSafety.setColor(Color.BLACK); @@ -611,7 +624,7 @@ public class MainPanel extends Panel { getLogger().log(Level.WARNING, null, ex); } } - buttonSampleLoad.setEnabled(!Boolean.TRUE.equals(value)); + updateButtonSampleLoadState(); } void updateMode(Object value) { @@ -1043,7 +1056,8 @@ public class MainPanel extends Panel { getLogger().log(Level.WARNING, null, e); } } - } + } + updateButtonSampleLoadState(); String text; try { List cache = (List)eval("get_cover_location_cache()", true);