From 1fd5b666e6e12dd224060c99230a87be14c62a9f Mon Sep 17 00:00:00 2001
From: gac-S_Changer <gac-S_Changer@PC13306.psi.ch>
Date: Thu, 24 Jan 2019 14:23:52 +0100
Subject: [PATCH]

---
 src/main/java/ch/psi/mxsc/Controller.java | 19 ++++++++++++++++++-
 src/main/java/ch/psi/mxsc/MainPanel.java  |  6 ++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/main/java/ch/psi/mxsc/Controller.java b/src/main/java/ch/psi/mxsc/Controller.java
index 41fd50c..42a97ed 100644
--- a/src/main/java/ch/psi/mxsc/Controller.java
+++ b/src/main/java/ch/psi/mxsc/Controller.java
@@ -400,7 +400,7 @@ public class Controller {
             return null;
         }
     }
-
+    
     public Boolean isRoomTemp() {
         try {
             return getMainFrame().eval("is_room_temp()", true).equals(true);
@@ -449,6 +449,23 @@ public class Controller {
         }
     }
 
+    public Boolean isRoomTempEnabled() {
+        try {
+            return getMainFrame().eval("is_room_temperature_enabled()", true).equals(true);
+        } catch (Exception ex) {
+            return null;
+        }
+    }   
+    
+    public Boolean isBeamlineStatusEnabled() {
+        try {
+            return getMainFrame().eval("is_beamline_status_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/MainPanel.java b/src/main/java/ch/psi/mxsc/MainPanel.java
index c6f0fa0..950df18 100644
--- a/src/main/java/ch/psi/mxsc/MainPanel.java
+++ b/src/main/java/ch/psi/mxsc/MainPanel.java
@@ -122,7 +122,7 @@ public class MainPanel extends Panel {
                     showException(ex);
                 }
             }
-        });
+        });         
     }
 
     @Override
@@ -132,13 +132,15 @@ public class MainPanel extends Panel {
             SwingUtils.getWindow(this).setIconImage(img);
         }
         basePlatePanel.setSelectionMode(SelectionMode.Pucks);
-        basePlatePanel.setDevice(Controller.getInstance().basePlate);
+        basePlatePanel.setDevice(Controller.getInstance().basePlate);     
     }
 
     @Override
     public void onInitialize(int runCount) {
         stopTimer();
         Controller.getInstance().onInitialize(runCount);
+        panelDisplayMode.setVisible(Controller.getInstance().isRoomTempEnabled());
+        panelBeamlineStatus.setVisible(Controller.getInstance().isBeamlineStatusEnabled());
         if (basePlatePanel.getDevice() != (Device) getDevice("BasePlate")) {
             basePlatePanel.setDevice((Device) getDevice("BasePlate"));
         }