Commit 6ae30bd9 authored by gonciarz's avatar gonciarz

Merge branch 'master' into develop

parents 0a1cc28c 04b9f9d8
......@@ -7,7 +7,7 @@
<groupId>mosaic</groupId>
<artifactId>MosaicSuite</artifactId>
<packaging>jar</packaging>
<version>1.0.10</version>
<version>1.0.11</version>
<description>Package contains image processing algorithms developed in MOSAIC Group</description>
<url>http://mosaic.mpi-cbg.de/?q=downloads/imageJ</url>
<inceptionYear>2010</inceptionYear>
......
......@@ -6,6 +6,7 @@ import javax.swing.JOptionPane;
import ij.IJ;
import ij.ImagePlus;
import ij.gui.HistogramWindow;
import ij.macro.Interpreter;
import ij.process.FloatProcessor;
......@@ -31,7 +32,7 @@ public class Utils {
* @param aMessage
*/
public static void messageDialog(String aTitle, String aMessage) {
if (IJ.getInstance() != null) IJ.showMessage(aMessage);
if (IJ.getInstance() != null || Interpreter.batchMode == true || IJ.isMacro()) IJ.showMessage(aMessage);
else JOptionPane.showMessageDialog(null, aMessage, aTitle, JOptionPane.PLAIN_MESSAGE);
}
}
......
......@@ -59,7 +59,8 @@ public class Inpainting extends CurvatureFilterBase {
@Override
protected boolean setup(String aArgs) {
setFilePrefix("inpainting_");
updateFlags(DOES_ALL);
final OpenDialog od = new OpenDialog("(Inpainting) Open mask file", "");
final String directory = od.getDirectory();
final String name = od.getFileName();
......
......@@ -83,7 +83,8 @@ public class SuperResolution extends CurvatureFilterBase {
@Override
protected boolean setup(String aArgs) {
setFilePrefix("resized_");
updateFlags(DOES_ALL);
// Super resolution will generate 2x bigger image than original one.
setScaleX(2.0);
setScaleY(2.0);
......
......@@ -52,6 +52,7 @@ public class VariationalCurvatureFilter extends CurvatureFilterBase {
setResultDestination(ResultOutput.UPDATE_ORIGINAL);
}
setFilePrefix("filtered_");
updateFlags(DOES_ALL);
setSplitMethodMenu(true);
return true;
}
......
......@@ -6,6 +6,8 @@ import java.awt.SystemColor;
import java.awt.TextArea;
import ij.gui.GenericDialog;
import mosaic.filamentSegmentation.GUI.OutputImageWindow;
import mosaic.plugins.utils.PlugInBase.ResultOutput;
import mosaic.variationalCurvatureFilters.CurvatureFilter;
import mosaic.variationalCurvatureFilters.FilterKernel;
import mosaic.variationalCurvatureFilters.FilterKernelBernstein;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment