From b6ca374eaa12a6b0d9c34482f61527064ce71293 Mon Sep 17 00:00:00 2001 From: Ruman Gerst Date: Tue, 24 Sep 2024 16:01:12 +0200 Subject: [PATCH] - removed object classification & autocontext until it works --- .../org/hkijena/jipipe/plugins/ilastik/IlastikPlugin.java | 4 ++-- .../ilastik/nodes/IlastikObjectClassificationAlgorithm.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/jipipe-plugin-ilastik/src/main/java/org/hkijena/jipipe/plugins/ilastik/IlastikPlugin.java b/plugins/jipipe-plugin-ilastik/src/main/java/org/hkijena/jipipe/plugins/ilastik/IlastikPlugin.java index bf737fa7c5..183574aaeb 100644 --- a/plugins/jipipe-plugin-ilastik/src/main/java/org/hkijena/jipipe/plugins/ilastik/IlastikPlugin.java +++ b/plugins/jipipe-plugin-ilastik/src/main/java/org/hkijena/jipipe/plugins/ilastik/IlastikPlugin.java @@ -370,7 +370,7 @@ public void register(JIPipe jiPipe, Context context, JIPipeProgressInfo progress registerNodeType("import-ilastik-hdf5-image", ImportIlastikHDF5ImageAlgorithm.class); registerNodeType("export-ilastik-hdf5-image", ExportIlastikHDF5ImageAlgorithm.class, UIUtils.getIconURLFromResources("actions/document-export.png")); registerNodeType("ilastik-pixel-classification", IlastikPixelClassificationAlgorithm.class, UIUtils.getIconURLFromResources("actions/insert-math-expression.png")); - registerNodeType("ilastik-autocontext", IlastikAutoContextAlgorithm.class, UIUtils.getIconURLFromResources("actions/insert-math-expression.png")); - registerNodeType("ilastik-object-classification", IlastikObjectClassificationAlgorithm.class, UIUtils.getIconURLFromResources("actions/insert-math-expression.png")); +// registerNodeType("ilastik-autocontext", IlastikAutoContextAlgorithm.class, UIUtils.getIconURLFromResources("actions/insert-math-expression.png")); +// registerNodeType("ilastik-object-classification", IlastikObjectClassificationAlgorithm.class, UIUtils.getIconURLFromResources("actions/insert-math-expression.png")); } } diff --git a/plugins/jipipe-plugin-ilastik/src/main/java/org/hkijena/jipipe/plugins/ilastik/nodes/IlastikObjectClassificationAlgorithm.java b/plugins/jipipe-plugin-ilastik/src/main/java/org/hkijena/jipipe/plugins/ilastik/nodes/IlastikObjectClassificationAlgorithm.java index 496fde3960..65dd31834c 100644 --- a/plugins/jipipe-plugin-ilastik/src/main/java/org/hkijena/jipipe/plugins/ilastik/nodes/IlastikObjectClassificationAlgorithm.java +++ b/plugins/jipipe-plugin-ilastik/src/main/java/org/hkijena/jipipe/plugins/ilastik/nodes/IlastikObjectClassificationAlgorithm.java @@ -75,7 +75,7 @@ @AddJIPipeCitation("Object classification documentation: https://www.ilastik.org/documentation/objects/objects") @ConfigureJIPipeNode(nodeTypeCategory = ImagesNodeTypeCategory.class, menuPath = "Ilastik") @AddJIPipeInputSlot(value = ImagePlusData.class, name = "Image", create = true, description = "The image(s) to classify.") -@AddJIPipeInputSlot(value = IlastikModelData.class, name = "Project", create = true, description = "The Ilastik project. Must support pixel classification.", role = JIPipeDataSlotRole.ParametersLooping) +@AddJIPipeInputSlot(value = IlastikModelData.class, name = "Project", create = true, description = "The Ilastik project. Must support object classification.", role = JIPipeDataSlotRole.ParametersLooping) @AddJIPipeOutputSlot(value = ImagePlusData.class, name = "Object Predictions", description = "A label image of the object class predictions") @AddJIPipeOutputSlot(value = ImagePlusData.class, name = "Object Probabilities", description = "A multi-channel image volume of object prediction probabilities instead of a label image (one channel for each prediction class)") @AddJIPipeOutputSlot(value = ImagePlusData.class, name = "Blockwise Object Predictions", description = "A label image of the object class predictions. " + @@ -86,7 +86,7 @@ @AddJIPipeOutputSlot(value = ResultsTableData.class, name = "Features", description = "Table of the computed object features that were used during classification, indexed by object id") public class IlastikObjectClassificationAlgorithm extends JIPipeSingleIterationAlgorithm implements IlastikEnvironmentAccessNode { - public static final List PROJECT_TYPES = Arrays.asList("ObjectClassification", "PixelClassification"); + public static final List PROJECT_TYPES = Arrays.asList("ObjectClassification"); // , "PixelClassification" public static final JIPipeDataSlotInfo OUTPUT_SLOT_OBJECT_PREDICTIONS = new JIPipeDataSlotInfo(ImagePlusData.class, JIPipeSlotType.Output,