From a39e103e9449ba9bdced23c2d7adcb7e731deadd Mon Sep 17 00:00:00 2001 From: x07maop Date: Mon, 24 Aug 2015 09:29:40 +0200 Subject: [PATCH] Closedown --- plugins/EnergyScan.java | 4 ++-- plugins/HystScan.form | 35 ++++++++++----------------------- plugins/HystScan.java | 43 ++++++++++++++--------------------------- script/local.py | 2 +- 4 files changed, 27 insertions(+), 57 deletions(-) diff --git a/plugins/EnergyScan.java b/plugins/EnergyScan.java index 1f9a9ee..0e17ce8 100644 --- a/plugins/EnergyScan.java +++ b/plugins/EnergyScan.java @@ -353,8 +353,8 @@ public class EnergyScan extends Panel { runAsync("EnergyScan", args).handle((ok, ex) -> { buttonAbort.setEnabled(false); - if ((ex != null) && (ex instanceof Exception)){ - showException((Exception) ex); + if (ex != null){ + getLogger().log(Level.WARNING, null, ex); } return ok; }); diff --git a/plugins/HystScan.form b/plugins/HystScan.form index 4730769..2158062 100644 --- a/plugins/HystScan.form +++ b/plugins/HystScan.form @@ -45,29 +45,20 @@ - + + - - - - - - - - - - - - - - - - + - - + + + + + + + @@ -131,7 +122,6 @@ - @@ -217,11 +207,6 @@ - - - - - diff --git a/plugins/HystScan.java b/plugins/HystScan.java index 0d62146..4aaba74 100644 --- a/plugins/HystScan.java +++ b/plugins/HystScan.java @@ -6,6 +6,7 @@ import ch.psi.pshell.ui.Panel; import ch.psi.utils.State; import java.awt.Component; import java.util.HashMap; +import java.util.logging.Level; import javax.swing.JLabel; /** @@ -69,7 +70,6 @@ public class HystScan extends Panel { spinnerStartField = new javax.swing.JSpinner(); spinnerEndField = new javax.swing.JSpinner(); jLabel4 = new javax.swing.JLabel(); - jRadioButton1 = new javax.swing.JRadioButton(); jPanel3 = new javax.swing.JPanel(); buttonExecute = new javax.swing.JButton(); buttonAbort = new javax.swing.JButton(); @@ -106,30 +106,22 @@ public class HystScan extends Panel { jLabel4.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING); jLabel4.setText("End Field:"); - jRadioButton1.setText("jRadioButton1"); - javax.swing.GroupLayout panelParametersLayout = new javax.swing.GroupLayout(panelParameters); panelParameters.setLayout(panelParametersLayout); panelParametersLayout.setHorizontalGroup( panelParametersLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(panelParametersLayout.createSequentialGroup() - .addGroup(panelParametersLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addContainerGap(30, Short.MAX_VALUE) + .addGroup(panelParametersLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) .addGroup(panelParametersLayout.createSequentialGroup() - .addContainerGap(30, Short.MAX_VALUE) - .addGroup(panelParametersLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addGroup(panelParametersLayout.createSequentialGroup() - .addComponent(jLabel2) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(spinnerE2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGroup(panelParametersLayout.createSequentialGroup() - .addComponent(jLabel1) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(spinnerE1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 45, Short.MAX_VALUE)) + .addComponent(jLabel2) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(spinnerE2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addGroup(panelParametersLayout.createSequentialGroup() - .addContainerGap() - .addComponent(jRadioButton1) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))) + .addComponent(jLabel1) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(spinnerE1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 45, Short.MAX_VALUE) .addGroup(panelParametersLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelParametersLayout.createSequentialGroup() .addGroup(panelParametersLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -181,8 +173,7 @@ public class HystScan extends Panel { .addGap(5, 5, 5) .addGroup(panelParametersLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(spinnerSleep, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel9) - .addComponent(jRadioButton1)) + .addComponent(jLabel9)) .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); @@ -243,7 +234,6 @@ public class HystScan extends Panel { private void buttonExecuteActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonExecuteActionPerformed try { - /* HashMap args = new HashMap(); Double e1 = (Double) spinnerE1.getValue(); Double e2 = (Double) spinnerE2.getValue(); @@ -254,14 +244,10 @@ public class HystScan extends Panel { args.put("RAMP_RATE", (Double) spinnerRampRate.getValue()); args.put("ENERGY_CHANGE_SLEEP", (Double) spinnerSleep.getValue()); buttonAbort.setEnabled(true); - runAsync("HystScan", args).handle((ok, ex) -> { - */ - buttonAbort.setEnabled(true); - runAsync("tutorial/01_LineScan").handle((ok, ex) -> { - + runAsync("HystScan", args).handle((ok, ex) -> { buttonAbort.setEnabled(false); - if ((ex != null) && (ex instanceof Exception)){ - showException((Exception) ex); + if (ex != null){ + getLogger().log(Level.WARNING, null, ex); } return ok; }); @@ -285,7 +271,6 @@ public class HystScan extends Panel { private javax.swing.JLabel jLabel8; private javax.swing.JLabel jLabel9; private javax.swing.JPanel jPanel3; - private javax.swing.JRadioButton jRadioButton1; private javax.swing.JPanel panelParameters; private javax.swing.JSpinner spinnerE1; private javax.swing.JSpinner spinnerE2; diff --git a/script/local.py b/script/local.py index 315f86e..951eac7 100644 --- a/script/local.py +++ b/script/local.py @@ -4,7 +4,7 @@ #Uncomment this line to create the simulated devices needed to the tutorial scripts. -run("tutorial/devices") +#run("tutorial/devices") energy = None