fix: Apply_BigWarp_Xfm groovy script and ApplyBigWarpPluging

* wrap loaded Sources with WarpedSource
saalfeldlab · Sep 11, 2024 · bf674fb · bf674fb
1 parent babb44c
commit bf674fb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/scripts/Apply_Bigwarp_Xfm.groovy b/scripts/Apply_Bigwarp_Xfm.groovy
@@ -10,6 +10,7 @@ import java.io.File;
 import java.io.IOException;
 import bdv.ij.ApplyBigwarpPlugin;
 import bdv.viewer.Interpolation;
+import bigwarp.BigWarpInit;
 import bigwarp.landmarks.LandmarkTableModel;
 import net.imglib2.realtransform.BoundingBoxEstimation;
 import ij.IJ;
@@ -40,10 +41,14 @@ if( interpType.equals( "Nearest Neighbor" ))
 bboxEst = new BoundingBoxEstimation();
 
 emptyWriteOpts = new ApplyBigwarpPlugin.WriteDestinationOptions( "", "", null, null );
-warpedIpList = ApplyBigwarpPlugin.apply(
-		movingIp, targetIp, ltm, transformType,
-		"Target", "", bboxEst, "Target",
-		null, null, null,
-		interp, isVirtual, nThreads, true, emptyWriteOpts );
+
+bwData = BigWarpInit.createBigWarpDataFromImages(movingIp, targetIp);
+bwData.wrapMovingSources();
+bboxEst = new BoundingBoxEstimation(BoundingBoxEstimation.Method.CORNERS);
+
+warpedIpList =  ApplyBigwarpPlugin.apply(
+		bwData, ltm, transformType, "Target", "", bboxEst,
+		"Target", null, null, null,
+		interp, isVirtual, nThreads, true, emptyWriteOpts);
 
 warpedIpList.get(0).show();
diff --git a/src/main/java/bdv/ij/ApplyBigwarpPlugin.java b/src/main/java/bdv/ij/ApplyBigwarpPlugin.java
@@ -779,6 +779,7 @@ public static List<ImagePlus> apply(
 			final WriteDestinationOptions writeOpts) {
 
 		final BigWarpData<?> bwData = BigWarpInit.createBigWarpDataFromImages(movingIp, targetIp);
+		bwData.wrapMovingSources();
 		return apply(bwData, landmarks, tranformTypeOption, fieldOfViewOption, fieldOfViewPointFilter, bboxEst,
 				resolutionOption, resolutionSpec, fovSpec, offsetSpec,
 				interp, isVirtual, nThreads, wait, writeOpts);