From 98f9bfd92951d8bbdb6437689a5afdb69fb2cb41 Mon Sep 17 00:00:00 2001
From: gac-iss <gac-iss@MPC2631.psi.ch>
Date: Tue, 26 Oct 2021 10:46:35 +0200
Subject: [PATCH] Fix panel update if invalid values

---
 nbactions.xml                   | 98 ++++++++++++++++-----------------
 pom.xml                         |  2 +-
 src/main/java/ScientaPanel.java | 39 ++++++++++---
 3 files changed, 81 insertions(+), 58 deletions(-)

diff --git a/nbactions.xml b/nbactions.xml
index 71f7d61..32eed6e 100644
--- a/nbactions.xml
+++ b/nbactions.xml
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actions>
-        <action>
-            <actionName>run</actionName>
-            <packagings>
-                <packaging>jar</packaging>
-            </packagings>
-            <goals>
-                <goal>process-classes</goal>
-                <goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
-            </goals>
-            <properties>
-                <exec.args>-classpath %classpath;C:\Users\gac-ISS\Dev\pshell\bin\pshell-1.14.0-fat.jar --add-opens java.base/jdk.internal.loader=ALL-UNNAMED ch.psi.pshell.ui.App -home=C:\Users\gac-ISS\Dev\pshell\home -pini</exec.args>
-                <exec.executable>java</exec.executable>
-                <exec.workingdir>../../home</exec.workingdir>
-            </properties>
-        </action>
-        <action>
-            <actionName>debug</actionName>
-            <packagings>
-                <packaging>jar</packaging>
-            </packagings>
-            <goals>
-                <goal>process-classes</goal>
-                <goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
-            </goals>
-            <properties>
-                <exec.args>-agentlib:jdwp=transport=dt_socket,server=n,address=${jpda.address} -classpath %classpath;C:\Users\gac-ISS\Dev\pshell\bin\pshell-1.14.0-fat.jar --add-opens java.base/jdk.internal.loader=ALL-UNNAMED ch.psi.pshell.ui.App -home=C:\Users\gac-ISS\Dev\pshell\home -pini</exec.args>
-                <exec.executable>java</exec.executable>
-                <jpda.listen>true</jpda.listen>
-                <exec.workingdir>../../home</exec.workingdir>
-            </properties>
-        </action>
-        <action>
-            <actionName>profile</actionName>
-            <packagings>
-                <packaging>jar</packaging>
-            </packagings>
-            <goals>
-                <goal>process-classes</goal>
-                <goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
-            </goals>
-            <properties>
-                <exec.args>-classpath %classpath;C:\Users\gac-ISS\Dev\pshell\bin\pshell-1.14.0-fat.jar --add-opens java.base/jdk.internal.loader=ALL-UNNAMED ch.psi.pshell.ui.App -home=C:\Users\gac-ISS\Dev\pshell\home -pini</exec.args>
-                <exec.executable>java</exec.executable>
-                <exec.workingdir>../../home</exec.workingdir>
-            </properties>
-        </action>
-    </actions>
+<?xml version="1.0" encoding="UTF-8"?>
+<actions>
+        <action>
+            <actionName>run</actionName>
+            <packagings>
+                <packaging>jar</packaging>
+            </packagings>
+            <goals>
+                <goal>process-classes</goal>
+                <goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
+            </goals>
+            <properties>
+                <exec.args>;C:\Users\gac-ISS\Dev\pshell\bin\pshell-1.17.0-fat.jar --add-opens java.base/jdk.internal.loader=ALL-UNNAMED -classpath %classpath ch.psi.pshell.ui.App -home=C:\Users\gac-ISS\Dev\pshell\home -pini</exec.args>
+                <exec.executable>java</exec.executable>
+                <exec.workingdir>../../home</exec.workingdir>
+            </properties>
+        </action>
+        <action>
+            <actionName>debug</actionName>
+            <packagings>
+                <packaging>jar</packaging>
+            </packagings>
+            <goals>
+                <goal>process-classes</goal>
+                <goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
+            </goals>
+            <properties>
+                <exec.args>-agentlib:jdwp=transport=dt_socket,server=n,address=${jpda.address} ;C:\Users\gac-ISS\Dev\pshell\bin\pshell-1.17.0-fat.jar --add-opens java.base/jdk.internal.loader=ALL-UNNAMED -classpath %classpath ch.psi.pshell.ui.App -home=C:\Users\gac-ISS\Dev\pshell\home -pini</exec.args>
+                <exec.executable>java</exec.executable>
+                <jpda.listen>true</jpda.listen>
+                <exec.workingdir>../../home</exec.workingdir>
+            </properties>
+        </action>
+        <action>
+            <actionName>profile</actionName>
+            <packagings>
+                <packaging>jar</packaging>
+            </packagings>
+            <goals>
+                <goal>process-classes</goal>
+                <goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
+            </goals>
+            <properties>
+                <exec.args>;C:\Users\gac-ISS\Dev\pshell\bin\pshell-1.17.0-fat.jar --add-opens java.base/jdk.internal.loader=ALL-UNNAMED -classpath %classpath ch.psi.pshell.ui.App -home=C:\Users\gac-ISS\Dev\pshell\home -pini</exec.args>
+                <exec.executable>java</exec.executable>
+                <exec.workingdir>../../home</exec.workingdir>
+            </properties>
+        </action>
+    </actions>
diff --git a/pom.xml b/pom.xml
index a889679..bec2506 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>pshell</artifactId>
-            <version>1.14.0</version>
+            <version>1.16.0</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/src/main/java/ScientaPanel.java b/src/main/java/ScientaPanel.java
index 5ea8d6f..e186a1a 100644
--- a/src/main/java/ScientaPanel.java
+++ b/src/main/java/ScientaPanel.java
@@ -1,5 +1,6 @@
 import ch.psi.pshell.device.Device;
 import ch.psi.pshell.device.DeviceAdapter;
+import ch.psi.pshell.device.DeviceBase.DeviceInvalidParameterException;
 import ch.psi.pshell.device.DeviceListener;
 
 
@@ -166,6 +167,7 @@ public final class ScientaPanel extends DevicePanel {
         Scienta.AcquisitionMode acquisitionMode;
         Scienta.EnergyMode energyMode;
         Scienta.DetectorMode detectorMode;
+        Integer pass;
         double low;
         double center;
         double high;
@@ -173,8 +175,7 @@ public final class ScientaPanel extends DevicePanel {
         //int frames;
         double time;
         double size;
-        int slices;
-        int pass;
+        int slices;        
         int iterations;
 
         int current;
@@ -188,13 +189,35 @@ public final class ScientaPanel extends DevicePanel {
 
         dd.spectrum = getDevice().getSpectrum().getValue();
 
-        dd.lensMode = getDevice().getLensMode();
-        dd.elementSet = getDevice().getElementSet();
+        try{
+            dd.lensMode = getDevice().getLensMode();
+        } catch (DeviceInvalidParameterException ex){
+            dd.lensMode = null;
+        }
+        try{        
+            dd.elementSet = getDevice().getElementSet();
+        } catch (DeviceInvalidParameterException ex){
+            dd.elementSet = null;
+        }        try{
         dd.acquisitionMode = getDevice().getAcquisitionMode();
-        dd.energyMode = getDevice().getEnergyMode();
-        dd.detectorMode = getDevice().getDetectorMode();
-        dd.pass = getDevice().getPassEnergy();
-
+        } catch (DeviceInvalidParameterException ex){
+            dd.acquisitionMode = null;
+        }        
+        try{
+            dd.energyMode = getDevice().getEnergyMode();
+        } catch (DeviceInvalidParameterException ex){
+            dd.energyMode = null;
+        }
+        try{
+            dd.detectorMode = getDevice().getDetectorMode();
+        } catch (DeviceInvalidParameterException ex){
+            dd.detectorMode = null;
+        }     
+        try{
+            dd.pass = getDevice().getPassEnergy();
+        } catch (DeviceInvalidParameterException ex){
+            dd.pass = null;
+        }     
         dd.low = getDevice().getLowEnergy().getValue();
         dd.center = getDevice().getCenterEnergy().getValue();
         dd.high = getDevice().getHighEnergy().getValue();