add interactive merge creation

biovoxxel · Nov 25, 2024 · 11d28f8 · 11d28f8
1 parent e890f5d
commit 11d28f8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/biovoxxel-figure-tools/src/main/java/svg/gui/BatchSvgExporter.java b/biovoxxel-figure-tools/src/main/java/svg/gui/BatchSvgExporter.java
@@ -30,9 +30,6 @@ public class BatchSvgExporter extends DynamicCommand {
 		@Parameter(label = "Keep multichannel composite", required = true, description = "keeps channels accessible in Inkscape but increases file size")
 		Boolean keepComposite = false;
 
-		@Parameter(label = "Make merge interactive", required = true, description = "")
-		Boolean makeInteractive = false;
-
 		@Parameter(label = "Export channels", choices = {"None", "Color", "Grayscale", "Color (no overlays)", "Grayscale (no overlays)"})
 		String exportChannelsSeparately = "None";
 
@@ -62,7 +59,7 @@ public void run() {
 
 
 				imp.setTitle(String.format("%02d", exportCounter) + "_" + originalImpTitle);
-				SVG_Object_Factory.saveImageAndOverlaysAsSVG(imp, folder, interpolationRange, keepComposite, makeInteractive, true, lockSensitiveROIs);
+				SVG_Object_Factory.saveImageAndOverlaysAsSVG(imp, folder, interpolationRange, keepComposite,true, lockSensitiveROIs);
 				imp.setTitle(originalImpTitle);
 				exportCounter++;
 
@@ -83,7 +80,7 @@ public void run() {
 								currentChannel.setOverlay(imp.getOverlay());
 							}
 							System.out.println("fileName = " + fileName);
-							SVG_Object_Factory.saveImageAndOverlaysAsSVG(currentChannel, folder, interpolationRange, false, false, true, lockSensitiveROIs);
+							SVG_Object_Factory.saveImageAndOverlaysAsSVG(currentChannel, folder, interpolationRange, false, true, lockSensitiveROIs);
 							exportCounter++;
 						}
 					}

diff --git a/biovoxxel-figure-tools/src/main/java/svg/gui/SVGExporter.java b/biovoxxel-figure-tools/src/main/java/svg/gui/SVGExporter.java
@@ -37,9 +37,6 @@ public class SVGExporter extends DynamicCommand {
 	@Parameter(label = "Keep multichannel composite", required = true, description = "keeps channels accessible in Inkscape but increases file size")
 	Boolean keepComposite = false;
 
-	@Parameter(label = "Make merge interactive", required = true, description = "")
-	Boolean makeInteractive = false;
-
 	@Parameter(label = "Export channels", choices = {"None", "Color", "Grayscale", "Color (no overlays)", "Grayscale (no overlays)"})
 	String exportChannelsSeparately = "None";
 
@@ -54,7 +51,7 @@ public class SVGExporter extends DynamicCommand {
 
 	public void run() {
 
-		SVG_Object_Factory.saveImageAndOverlaysAsSVG(imp, createSVGFile(), interpolationRange, keepComposite, makeInteractive, true, lockSensitiveROIs);
+		SVG_Object_Factory.saveImageAndOverlaysAsSVG(imp, createSVGFile(), interpolationRange, keepComposite, true, lockSensitiveROIs);
 
 		if (!exportChannelsSeparately.equalsIgnoreCase("none") && imp.isComposite()) {
 			exportIndividualChannels();			
@@ -81,7 +78,7 @@ private void exportIndividualChannels() {
 					currentChannel.setOverlay(imp.getOverlay());
 				}
 				System.out.println("fileName = " + fileName);
-				SVG_Object_Factory.saveImageAndOverlaysAsSVG(currentChannel, createSVGFile(), interpolationRange, false, false, true, lockSensitiveROIs);
+				SVG_Object_Factory.saveImageAndOverlaysAsSVG(currentChannel, createSVGFile(), interpolationRange, false, true, lockSensitiveROIs);
 			}
 		}
 	}	

diff --git a/biovoxxel-figure-tools/src/main/java/svg/gui/TimeSeriesSvgExporter.java b/biovoxxel-figure-tools/src/main/java/svg/gui/TimeSeriesSvgExporter.java
@@ -32,9 +32,6 @@ public class TimeSeriesSvgExporter extends DynamicCommand {
 	@Parameter(label = "Keep multichannel composite", required = true, description = "keeps channels accessible in Inkscape but increases file size")
 	Boolean keepComposite = false;
 
-	@Parameter(label = "Make merge interactive", required = true, description = "")
-	Boolean makeInteractive = false;
-
 	@Parameter(label = "First frame", required = true)
 	Integer firstFrame = 1;
 
@@ -61,7 +58,7 @@ public void run() {
 				ImagePlus currentSliceImp = imp.crop("whole-slice");
 				currentSliceImp.setTitle(imp.getTitle() + "_" + slice);
 
-				SVG_Object_Factory.saveImageAndOverlaysAsSVG(currentSliceImp, createSVGFile(slice), interpolationRange, keepComposite, makeInteractive, true, lockSensitiveROIs);
+				SVG_Object_Factory.saveImageAndOverlaysAsSVG(currentSliceImp, createSVGFile(slice), interpolationRange, keepComposite, true, lockSensitiveROIs);
 
 			}
 		}