feat: correct loading of transform mask from project

* adds more complete method to set transform mask properties
saalfeldlab · Nov 28, 2023 · b944b3d · b944b3d
1 parent f69a4d0
commit b944b3d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/src/main/java/bigwarp/BigWarp.java b/src/main/java/bigwarp/BigWarp.java
@@ -2489,6 +2489,20 @@ public void setTransformMaskProperties( final FalloffShape falloffShape,
 		mask.setCenter( center );
 	}
 
+	public void setTransformMaskProperties( final FalloffShape falloffShape,
+			final double squaredRadius,
+			final double squaredSigma,
+			double[] center )
+	{
+		warpVisDialog.maskOptionsPanel.getMaskFalloffTypeDropdown().setSelectedItem(falloffShape);
+
+		final PlateauSphericalMaskRealRandomAccessible mask = getTransformPlateauMaskSource().getRandomAccessible();
+		mask.setFalloffShape( falloffShape );
+		mask.setSquaredRadius( squaredRadius );
+		mask.setSquaredSigma( squaredSigma );
+		mask.setCenter( center );
+	}
+
 	public void importTransformMaskSourceDialog() {
 
 		final JFileChooser fileChooser = new JFileChooser();

diff --git a/src/main/java/bigwarp/source/PlateauSphericalMaskRealRandomAccessible.java b/src/main/java/bigwarp/source/PlateauSphericalMaskRealRandomAccessible.java
@@ -218,7 +218,7 @@ public void setSigma( double sigma )
 
 	public void setSquaredSigma( double squaredSigma )
 	{
-		setSigma( Math.sqrt( sqrSigma ));
+		setSigma( Math.sqrt( squaredSigma ));
 	}
 
 	public void incSquaredSigma( double increment )

diff --git a/src/main/java/bigwarp/transforms/io/TransformWriterJson.java b/src/main/java/bigwarp/transforms/io/TransformWriterJson.java
@@ -99,6 +99,7 @@ public static void read( final BigWarp< ? > bw, final JsonObject json )
 				bw.setTransformMaskProperties(
 						maskFromJson.getFallOffShape(),
 						maskFromJson.getSquaredRadius(),
+						maskFromJson.getSquaredSigma(),
 						maskFromJson.getCenter().positionAsDoubleArray());
 			}else
 				bw.connectMaskSource();