diff --git a/src/main/java/averagingND/ConstantsAveragingND.java b/src/main/java/averagingND/ConstantsAveragingND.java new file mode 100644 index 0000000..22b85de --- /dev/null +++ b/src/main/java/averagingND/ConstantsAveragingND.java @@ -0,0 +1,5 @@ +package averagingND; + +public interface ConstantsAveragingND { + public static final String sVersion="0.0.4"; +} diff --git a/src/main/java/averagingND/IterativeAveraging.java b/src/main/java/averagingND/IterativeAveraging.java index 27c723e..bd502c9 100644 --- a/src/main/java/averagingND/IterativeAveraging.java +++ b/src/main/java/averagingND/IterativeAveraging.java @@ -52,8 +52,13 @@ public class IterativeAveraging implements PlugIn, DialogListener { /** set of images for averaging and information about them **/ ImageSet imageSet; - + /** constrains during the averaging + * 0 - no constrains + * 1 - constrains in pixels + * 2 - constrains as a fraction of max displacement + * **/ public int nConstrainReg = 0; + Label [] limName; TextField [] limVal; /** dimensions of dataset for averaging (always 1 channel) **/ @@ -69,6 +74,11 @@ public void run(String paramString) { double [] dLimits; + //double format formatting toold + DecimalFormatSymbols symbols = new DecimalFormatSymbols(); + symbols.setDecimalSeparator('.'); + DecimalFormat df = new DecimalFormat ("#.########", symbols); + DecimalFormat df1 = new DecimalFormat ("#.#", symbols); final String[] sInput = new String[2]; sInput[0] = "All currently open images"; @@ -80,7 +90,8 @@ public void run(String paramString) { gdFiles.showDialog(); if ( gdFiles.wasCanceled() ) - return; + return; + IJ.log("Iterative ND averaging plugin, version " + ConstantsAveragingND.sVersion); nInput = gdFiles.getNextChoiceIndex(); Prefs.set("RegisterNDFFT.IA.nInput", sInput[nInput]); @@ -181,22 +192,40 @@ public void run(String paramString) { { if(nConstrainReg == 1) { + IJ.log("Averaging with constrain specified in voxels:"); + for(d=0;d