From 872eb21eb460e959ba65ddce10a37e26a6998ae0 Mon Sep 17 00:00:00 2001
From: gac-S_Changer <gac-S_Changer@PC13306.psi.ch>
Date: Thu, 24 Jan 2019 14:40:48 +0100
Subject: [PATCH]

---
 src/main/java/ch/psi/mxsc/Controller.java   | 8 ++++++++
 src/main/java/ch/psi/mxsc/DevicesPanel.java | 9 ++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/main/java/ch/psi/mxsc/Controller.java b/src/main/java/ch/psi/mxsc/Controller.java
index 42a97ed..dd867b6 100644
--- a/src/main/java/ch/psi/mxsc/Controller.java
+++ b/src/main/java/ch/psi/mxsc/Controller.java
@@ -465,6 +465,14 @@ public class Controller {
         }
     }   
     
+    public Boolean isImagingEnabled() {
+        try {
+            return getMainFrame().eval("is_imaging_enabled()", true).equals(true);
+        } catch (Exception ex) {
+            return null;
+        }
+    }   
+
     
     public void imageDetectPucks() throws Context.ContextStateException {
         imageDetectPucks(null, null, null);
diff --git a/src/main/java/ch/psi/mxsc/DevicesPanel.java b/src/main/java/ch/psi/mxsc/DevicesPanel.java
index 4a3efd5..d728f9f 100644
--- a/src/main/java/ch/psi/mxsc/DevicesPanel.java
+++ b/src/main/java/ch/psi/mxsc/DevicesPanel.java
@@ -25,7 +25,9 @@ public class DevicesPanel extends javax.swing.JPanel {
     GenericDevice puck_detection;
     GenericDevice sm;
     GenericDevice img;        
-    GenericDevice gripper_cam;    
+    GenericDevice gripper_cam;  
+    
+    boolean imagingEnabled;
     
     /**
      * Creates new form DevicesPanel
@@ -56,7 +58,8 @@ public class DevicesPanel extends javax.swing.JPanel {
             public void onDeviceRemoved(GenericDevice dev) {
             }
         });   
-         updateDevices();
+        imagingEnabled = Controller.getInstance().isImagingEnabled();
+        updateDevices();
     }
     
     void updateDevices(){
@@ -72,7 +75,7 @@ public class DevicesPanel extends javax.swing.JPanel {
         wago = Controller.getInstance().getDevice("wago");
         laser = Controller.getInstance().getDevice("ue");
         puck_detection = Controller.getInstance().getDevice("puck_detection");
-        img = Controller.getInstance().getDevice("img");          
+        img = imagingEnabled ? Controller.getInstance().getDevice("img") : null;          
         gripper_cam = Controller.getInstance().getDevice("gripper_cam");          
         sm = Controller.getInstance().getDevice("smart_magnet");          
         update();