From 3d571e8a4e63a1d945fc7dde8124652beaae514f Mon Sep 17 00:00:00 2001
From: gac-S_Changer <gac-S_Changer@PC12288.psi.ch>
Date: Fri, 10 Aug 2018 17:07:54 +0200
Subject: [PATCH]

---
 src/main/java/ch/psi/mxsc/MainPanel.form | 6 ++----
 src/main/java/ch/psi/mxsc/MainPanel.java | 7 ++++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/ch/psi/mxsc/MainPanel.form b/src/main/java/ch/psi/mxsc/MainPanel.form
index 4f7f297..419f8a6 100644
--- a/src/main/java/ch/psi/mxsc/MainPanel.form
+++ b/src/main/java/ch/psi/mxsc/MainPanel.form
@@ -61,10 +61,8 @@
                   <Component id="jPanel4" linkSize="2" max="32767" attributes="0"/>
                   <Component id="jPanel7" linkSize="2" alignment="0" max="32767" attributes="0"/>
                   <Component id="jPanel13" linkSize="2" max="32767" attributes="0"/>
-                  <Group type="103" alignment="1" groupAlignment="0" max="-2" attributes="0">
-                      <Component id="jPanel8" linkSize="2" alignment="1" max="32767" attributes="0"/>
-                      <Component id="jPanel12" linkSize="2" alignment="1" max="32767" attributes="0"/>
-                  </Group>
+                  <Component id="jPanel8" linkSize="2" alignment="1" max="32767" attributes="0"/>
+                  <Component id="jPanel12" linkSize="2" alignment="1" max="32767" attributes="0"/>
                   <Component id="jPanel10" linkSize="2" alignment="1" min="-2" max="-2" attributes="0"/>
               </Group>
               <EmptySpace max="-2" attributes="0"/>
diff --git a/src/main/java/ch/psi/mxsc/MainPanel.java b/src/main/java/ch/psi/mxsc/MainPanel.java
index c032c23..0418baf 100644
--- a/src/main/java/ch/psi/mxsc/MainPanel.java
+++ b/src/main/java/ch/psi/mxsc/MainPanel.java
@@ -294,7 +294,12 @@ public class MainPanel extends Panel {
         panelDetection.setVisible(expert);
         
         if (checkExpert.isSelected()!=expert){
-            checkExpert.setSelected(expert);
+            checkExpert.setSelected(expert);           
+        }
+        if (expert==false){
+            buttonCamera.setSelected(false);
+            buttonDrawing.setSelected(true);
+            updateViewType();             
         }
     }