Fix loading of IJ1 macros outside BAR/scrips

Author: tferr

BAR/src/main/java/bar/Runner.java

@@ -203,8 +203,22 @@ else if (fsm.isDone())
 	 *            the argument string to be retrieved through the IJ1 built-in
 	 *            macro function {@code getArgument()}
 	 */
+	public void runBARMacro(final String path, final String arg) {
+		runIJ1Macro("scripts/BAR/" + path, arg);
+	}
+
+	/**
+	 * Legacy method that supports IJ1 macros that do not use script parameters.
+	 * Ported from {@link Macro_Runner#runMacroFromJar(String, String)}.
+	 *
+	 * @param path
+	 *            the path to the IJ1 macro in the BAR jar file
+	 * @param arg
+	 *            the argument string to be retrieved through the IJ1 built-in
+	 *            macro function {@code getArgument()}
+	 */
 	public void runIJ1Macro(final String path, final String arg) {
-		final String macro = readContents("/scripts/" + path, true);
+		final String macro = readContents(path, true);
 		setStatus((macro == null) ? EXCEPTION : (new Macro_Runner()).runMacro(macro, arg));
 	}
 

BAR/src/main/resources/scripts/BAR/Analysis/Multichannel_ZT-axis_Profile.bsh

@@ -61,7 +61,7 @@ void customRoutine(double[] values) {
 		rt.setValue(colHeading, i, values[i]);
 	rt.show("Results");
 	runner = new Runner(context);
-	runner.runIJ1Macro("BAR/Data_Analysis/Distribution_Plotter.ijm", colHeading);
+	runner.runBARMacro("Data_Analysis/Distribution_Plotter.ijm", colHeading);
 	if (!runner.scriptLoaded())
 		uiService.showDialog("Profile distributions not plotted.\nCheck console for details", "Error");
 }

BAR/src/main/resources/scripts/BAR/Data_Analysis/NN_Distances.py

@@ -17,7 +17,7 @@
 def plot_distributions():
     from bar import Runner
     runner = Runner(context)
-    runner.runIJ1Macro("BAR/Data_Analysis/Distribution_Plotter.ijm", "NN distance")
+    runner.runBARMacro("Data_Analysis/Distribution_Plotter.ijm", "NN distance")
     if not runner.scriptLoaded():
         uiService.showDialog("Distribution of NN distances not plotted.\n"
                            + "Check console for details", "Error")