diff --git a/config/plugins.properties b/config/plugins.properties index 68a8c20..976f381 100644 --- a/config/plugins.properties +++ b/config/plugins.properties @@ -1,4 +1,4 @@ -LaserGunAlignment.java=enabled +LaserGunAlignment.java=disabled test2.java=disabled -GunSolenoidAlignment.java=disabled +GunSolenoidAlignment.java=enabled test.java=disabled diff --git a/plugins/GunSolenoidAlignment.form b/plugins/GunSolenoidAlignment.form index fa02d4b..25b1842 100644 --- a/plugins/GunSolenoidAlignment.form +++ b/plugins/GunSolenoidAlignment.form @@ -317,13 +317,11 @@ - - diff --git a/plugins/GunSolenoidAlignment.java b/plugins/GunSolenoidAlignment.java index 2763ad4..7d36a73 100644 --- a/plugins/GunSolenoidAlignment.java +++ b/plugins/GunSolenoidAlignment.java @@ -15,6 +15,7 @@ import ch.psi.utils.Convert; import ch.psi.utils.State; import java.util.HashMap; import java.util.List; +import java.util.concurrent.CompletableFuture; import java.util.logging.Level; /** @@ -179,10 +180,8 @@ public class GunSolenoidAlignment extends Panel { spinnerNumImages.setModel(new javax.swing.SpinnerNumberModel(0, 0, 10, 1)); - checkElog.setSelected(true); checkElog.setText("ELOG"); - checkZeroSolenoids.setSelected(true); checkZeroSolenoids.setText("Zero solenoids"); javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1); @@ -365,10 +364,25 @@ public class GunSolenoidAlignment extends Panel { args.put("zero_solenoids", checkZeroSolenoids.isSelected()); args.put("do_elog", checkElog.isSelected()); - ((Plugin) this).runAsync("Alignment/Gun_solenoid_alignment", args).thenAccept((Object t) -> { - List ret = (List) t; - onEndScan((ScanResult) ret.get(0), (List) ret.get(1), (List) ret.get(2)); + + + ((Plugin) this).runAsync("Alignment/Gun_solenoid_alignment", args).thenAccept((Object ret) -> { + /*((Plugin) this).runAsync("Alignment/Gun_solenoid_alignment", args).handle((ret, ex) -> { + if (ex != null){ + getLogger().log(Level.SEVERE, null, ex); + return null; + } + */ + List l = (List) ret; + System.out.print("Sucesss"); + getLogger().log(Level.INFO, "Succes"); + getLogger().log(Level.INFO, String.valueOf(l)); + System.out.print(l); + onEndScan((ScanResult) l.get(0), (List) l.get(1), (List) l.get(2)); + //return null; }); + + } catch (Exception ex) { running = false; showException(ex);