pshell_config/sf-op
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closedown

Browse Source
This commit is contained in:
sfop
2016-07-06 09:37:14 +02:00
parent fca5f2bc70
commit 04474910af
3 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/GunSolenoidAlignment.java
View File

@@ -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);