From 27db492ef8d531d5e3829138f0b2883f000dd9f6 Mon Sep 17 00:00:00 2001
From: x03daop <x03daop@x03da-cons-1.psi.ch>
Date: Tue, 3 May 2016 09:53:55 +0200
Subject: [PATCH] Closedown

---
 plugins/PhotonEnergy.java | 8 +++++++-
 plugins/XPSSpectrum.form  | 5 +++++
 plugins/XPSSpectrum.java  | 2 ++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/plugins/PhotonEnergy.java b/plugins/PhotonEnergy.java
index f71e6d53..1ba62976 100644
--- a/plugins/PhotonEnergy.java
+++ b/plugins/PhotonEnergy.java
@@ -6,6 +6,7 @@ import ch.psi.pshell.scan.Scan;
 import ch.psi.pshell.scan.ScanListener;
 import ch.psi.pshell.scan.ScanRecord;
 import ch.psi.pshell.ui.Panel;
+import ch.psi.utils.Convert;
 import ch.psi.utils.State;
 import ch.psi.utils.swing.SwingUtils;
 import java.awt.Component;
@@ -137,6 +138,7 @@ public class PhotonEnergy extends Panel {
 
                 step++;
                 energy += stepSize;
+                energy = Convert.roundDouble(energy, 3);
             } while (energy <= end);
         }
         return ret.toArray(new Double[0][0]);
@@ -621,7 +623,11 @@ public class PhotonEnergy extends Panel {
     }//GEN-LAST:event_buttonStartActionPerformed
 
     private void buttonAbortActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonAbortActionPerformed
-        abort();
+        try {
+            abort();
+        } catch (Exception ex) {
+            SwingUtils.showException(this, ex);
+        }        
     }//GEN-LAST:event_buttonAbortActionPerformed
 
     private void radioCisActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_radioCisActionPerformed
diff --git a/plugins/XPSSpectrum.form b/plugins/XPSSpectrum.form
index 03d5f2e0..b3ffb4ab 100644
--- a/plugins/XPSSpectrum.form
+++ b/plugins/XPSSpectrum.form
@@ -340,6 +340,11 @@
           </Events>
         </Component>
         <Component class="ch.psi.pshell.swing.RangeSelectionPanel" name="rangeSelectionPanel">
+          <Properties>
+            <Property name="tablePosition" type="ch.psi.pshell.swing.RangeSelectionPanel$TablePosition" editor="org.netbeans.modules.form.editors.EnumEditor">
+              <Value id="bottom"/>
+            </Property>
+          </Properties>
           <AuxValues>
             <AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new ch.psi.pshell.swing.RangeSelectionPanel() {&#xa;    protected void onSeriesChanged() {&#xa;        updateButtons();&#xa;    }&#xa;    protected void onSelectionChanged() {&#xa;        updateButtons();&#xa;    }&#xa;}&#xa;"/>
           </AuxValues>
diff --git a/plugins/XPSSpectrum.java b/plugins/XPSSpectrum.java
index 220265bd..df5b2e77 100644
--- a/plugins/XPSSpectrum.java
+++ b/plugins/XPSSpectrum.java
@@ -404,6 +404,8 @@ public class XPSSpectrum extends Panel {
             }
         });
 
+        rangeSelectionPanel.setTablePosition(ch.psi.pshell.swing.RangeSelectionPanel.TablePosition.bottom);
+
         buttonAbort.setText("Abort");
         buttonAbort.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {