This commit is contained in:
x07maop
2015-06-16 11:01:12 +02:00
parent 06b39c09ad
commit 6f88bc1770

View File

@@ -3,7 +3,6 @@
*/
import ch.psi.pshell.dev.Device;
import ch.psi.pshell.dev.DeviceBase;
import ch.psi.pshell.dev.DeviceListener;
import ch.psi.pshell.epics.ChannelDoubleArray;
import ch.psi.pshell.epics.ChannelInteger;
@@ -15,7 +14,6 @@ import ch.psi.pshell.ui.Panel;
import ch.psi.utils.State;
import ch.psi.utils.swing.SwingUtils;
import javax.swing.JPanel;
import javax.swing.SwingUtilities;
/**
*
@@ -145,14 +143,14 @@ public class EnergyScan extends Panel {
private void buttonExecuteActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonExecuteActionPerformed
try {
run("test1");
runAsync("test1");
} catch (Exception ex) {
SwingUtils.showException(this, ex);
}
}//GEN-LAST:event_buttonExecuteActionPerformed
private void buttonAbortActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonAbortActionPerformed
getController().abort();
abort();
}//GEN-LAST:event_buttonAbortActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables