Starts BigWarp edition of registration in EventQueue to avoid deadlock

Author: NicoKiaru

Diff for: src/main/java/ch/epfl/biop/registration/sourceandconverter/spline/Elastix2DSplineRegistration.java

@@ -26,6 +26,8 @@
 import sc.fiji.bdvpg.sourceandconverter.SourceAndConverterHelper;
 import sc.fiji.bdvpg.sourceandconverter.register.BigWarpLauncher;
 
+import java.awt.EventQueue;
+import java.lang.reflect.InvocationTargetException;
 import java.util.*;
 import java.util.concurrent.Future;
 import java.util.stream.Collectors;
@@ -257,42 +259,51 @@ private RealTransform pruneLandMarksOutsideAtlas(RealTransform rt_in) {
         dialog.show();
     };
 
+    BigWarpLauncher bwl;
+
     @Override
     public boolean edit() {
+        try {
+            EventQueue.invokeAndWait(() -> {
+                List<SourceAndConverter<?>> movingSacs = Arrays.stream(mimg).collect(Collectors.toList());
 
-        List<SourceAndConverter<?>> movingSacs = Arrays.stream(mimg).collect(Collectors.toList());
-
-        List<SourceAndConverter<?>> fixedSacs = Arrays.stream(fimg).collect(Collectors.toList());
+                List<SourceAndConverter<?>> fixedSacs = Arrays.stream(fimg).collect(Collectors.toList());
 
-        List<ConverterSetup> converterSetups = Arrays.stream(mimg).map(src -> SourceAndConverterServices.getSourceAndConverterService().getConverterSetup(src)).collect(Collectors.toList());
+                List<ConverterSetup> converterSetups = Arrays.stream(mimg).map(src -> SourceAndConverterServices.getSourceAndConverterService().getConverterSetup(src)).collect(Collectors.toList());
 
-        converterSetups.addAll(Arrays.stream(fimg).map(src -> SourceAndConverterServices.getSourceAndConverterService().getConverterSetup(src)).collect(Collectors.toList()));
+                converterSetups.addAll(Arrays.stream(fimg).map(src -> SourceAndConverterServices.getSourceAndConverterService().getConverterSetup(src)).collect(Collectors.toList()));
 
-        // Launch BigWarp
-        BigWarpLauncher bwl = new BigWarpLauncher(movingSacs, fixedSacs, "Big Warp", converterSetups);
-        bwl.set2d();
-        bwl.run();
+                // Launch BigWarp
+                bwl = new BigWarpLauncher(movingSacs, fixedSacs, "Big Warp", converterSetups);
+                bwl.set2d();
+                bwl.run();
 
-        // Output bdvh handles -> will be put in the object service
-        BdvHandle bdvhQ = bwl.getBdvHandleQ();
-        BdvHandle bdvhP = bwl.getBdvHandleP();
+                // Output bdvh handles -> will be put in the object service
+                BdvHandle bdvhQ = bwl.getBdvHandleQ();
+                BdvHandle bdvhP = bwl.getBdvHandleP();
 
-        bdvhP.getViewerPanel().state().setViewerTransform(BdvHandleHelper.getViewerTransformWithNewCenter(bdvhP, new double[]{0,0,0}));
-        bdvhQ.getViewerPanel().state().setViewerTransform(BdvHandleHelper.getViewerTransformWithNewCenter(bdvhQ, new double[]{0,0,0}));
+                bdvhP.getViewerPanel().state().setViewerTransform(BdvHandleHelper.getViewerTransformWithNewCenter(bdvhP, new double[]{0,0,0}));
+                bdvhQ.getViewerPanel().state().setViewerTransform(BdvHandleHelper.getViewerTransformWithNewCenter(bdvhQ, new double[]{0,0,0}));
 
-        bdvhQ.getViewerPanel().state().setDisplayMode(DisplayMode.FUSED);
-        bdvhP.getViewerPanel().state().setDisplayMode(DisplayMode.FUSED);
+                bdvhQ.getViewerPanel().state().setDisplayMode(DisplayMode.FUSED);
+                bdvhP.getViewerPanel().state().setDisplayMode(DisplayMode.FUSED);
 
-        SourceAndConverterServices.getBdvDisplayService().pairClosing(bdvhQ,bdvhP);
+                SourceAndConverterServices.getBdvDisplayService().pairClosing(bdvhQ,bdvhP);
 
-        bdvhP.getViewerPanel().requestRepaint();
-        bdvhQ.getViewerPanel().requestRepaint();
+                bdvhP.getViewerPanel().requestRepaint();
+                bdvhQ.getViewerPanel().requestRepaint();
 
-        bwl.getBigWarp().getLandmarkFrame().repaint();
+                bwl.getBigWarp().getLandmarkFrame().repaint();
 
-        if (rt!=null) {
-            bwl.getBigWarp().loadLandmarks(BigWarpFileFromRealTransform(rt));
-            bwl.getBigWarp().setIsMovingDisplayTransformed(true);
+                if (rt!=null) {
+                    bwl.getBigWarp().loadLandmarks(BigWarpFileFromRealTransform(rt));
+                    bwl.getBigWarp().setIsMovingDisplayTransformed(true);
+                }
+            });
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        } catch (InvocationTargetException e) {
+            throw new RuntimeException(e);
         }
 
         waitForUser.run();