From 79748c9cbc1d692c2480f73558de4daa024590ca Mon Sep 17 00:00:00 2001 From: Stephen Cross Date: Fri, 16 Aug 2024 10:18:27 +0100 Subject: [PATCH] Updates to ShowImage --- .../mia/module/images/process/NormaliseIntensity.java | 4 ++-- .../mia/module/inputoutput/SaveObjectsAsROIs.java | 1 - .../github/mianalysis/mia/module/visualise/ShowImage.java | 2 +- .../images/process/binary/BinaryOperations2DMSTest.java | 4 ---- .../images/process/threshold/LocalAutoThresholdMSTest.java | 6 ------ 5 files changed, 3 insertions(+), 14 deletions(-) diff --git a/mia-modules/src/main/java/io/github/mianalysis/mia/module/images/process/NormaliseIntensity.java b/mia-modules/src/main/java/io/github/mianalysis/mia/module/images/process/NormaliseIntensity.java index 8fc595007..19d182a3a 100644 --- a/mia-modules/src/main/java/io/github/mianalysis/mia/module/images/process/NormaliseIntensity.java +++ b/mia-modules/src/main/java/io/github/mianalysis/mia/module/images/process/NormaliseIntensity.java @@ -328,11 +328,11 @@ public Status process(Workspace workspace) { Image outputImage = ImageFactory.createImage(outputImageName, inputImagePlus); workspace.addImage(outputImage); if (showOutput) - outputImage.showImage(outputImageName, LUT.createLutFromColor(Color.WHITE), false, true); + outputImage.show(outputImageName, LUT.createLutFromColor(Color.WHITE), false, true); } else { if (showOutput) - inputImage.showImage(inputImageName, LUT.createLutFromColor(Color.WHITE), false, true); + inputImage.show(inputImageName, LUT.createLutFromColor(Color.WHITE), false, true); } diff --git a/mia-modules/src/main/java/io/github/mianalysis/mia/module/inputoutput/SaveObjectsAsROIs.java b/mia-modules/src/main/java/io/github/mianalysis/mia/module/inputoutput/SaveObjectsAsROIs.java index a776f69ad..da369426b 100644 --- a/mia-modules/src/main/java/io/github/mianalysis/mia/module/inputoutput/SaveObjectsAsROIs.java +++ b/mia-modules/src/main/java/io/github/mianalysis/mia/module/inputoutput/SaveObjectsAsROIs.java @@ -16,7 +16,6 @@ import ij.gui.Roi; import ij.io.RoiEncoder; -import io.github.mianalysis.mia.MIA; import io.github.mianalysis.mia.module.Categories; import io.github.mianalysis.mia.module.Category; import io.github.mianalysis.mia.module.Module; diff --git a/mia-modules/src/main/java/io/github/mianalysis/mia/module/visualise/ShowImage.java b/mia-modules/src/main/java/io/github/mianalysis/mia/module/visualise/ShowImage.java index 7bf95859a..37fcf3eb1 100644 --- a/mia-modules/src/main/java/io/github/mianalysis/mia/module/visualise/ShowImage.java +++ b/mia-modules/src/main/java/io/github/mianalysis/mia/module/visualise/ShowImage.java @@ -134,7 +134,7 @@ public Status process(Workspace workspace) { break; } - if (showOutput) image.showImage(title,null,normalisation,composite); + if (showOutput) image.show(title,null,normalisation,composite); return Status.PASS; diff --git a/mia-modules/src/test/java/io/github/mianalysis/mia/module/images/process/binary/BinaryOperations2DMSTest.java b/mia-modules/src/test/java/io/github/mianalysis/mia/module/images/process/binary/BinaryOperations2DMSTest.java index 2cc833794..d929f284f 100644 --- a/mia-modules/src/test/java/io/github/mianalysis/mia/module/images/process/binary/BinaryOperations2DMSTest.java +++ b/mia-modules/src/test/java/io/github/mianalysis/mia/module/images/process/binary/BinaryOperations2DMSTest.java @@ -191,10 +191,6 @@ public static void runTest(Dimension dimension, Filter filter, Logic logic, int assertNotNull(workspace.getImage("Test_output")); Image outputImage = workspace.getImage("Test_output"); - // new ImageJ(); - // expectedImage.showImage(); - // outputImage.showImage(); - // IJ.runMacro("waitForUser"); assertEquals(expectedImage, outputImage); } diff --git a/mia-modules/src/test/java/io/github/mianalysis/mia/module/images/process/threshold/LocalAutoThresholdMSTest.java b/mia-modules/src/test/java/io/github/mianalysis/mia/module/images/process/threshold/LocalAutoThresholdMSTest.java index d8a374ffe..b02597572 100644 --- a/mia-modules/src/test/java/io/github/mianalysis/mia/module/images/process/threshold/LocalAutoThresholdMSTest.java +++ b/mia-modules/src/test/java/io/github/mianalysis/mia/module/images/process/threshold/LocalAutoThresholdMSTest.java @@ -245,12 +245,6 @@ public static void runTest(Dimension dimension, Threshold threshold, Logic logic assertNotNull(workspace.getImage("Test_output")); Image outputImage = workspace.getImage("Test_output"); - - // new ij.ImageJ(); - // expectedImage.showImage(); - // outputImage.showImage(); - // IJ.runMacro("waitForUser"); - assertEquals(expectedImage, outputImage); }