Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/PartSeg_smfish/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ def register():
segmentation.LayerRangeThresholdFlow,
RegisterEnum.roi_mask_segmentation_algorithm,
)
register_fun(
segmentation.ThresholdFlowAlgorithmWithDilation,
RegisterEnum.roi_mask_segmentation_algorithm,
)
register_fun(measurement.ComponentType, RegisterEnum.analysis_measurement)

if getattr(sys, "frozen", False):
Expand Down
55 changes: 55 additions & 0 deletions src/PartSeg_smfish/segmentation.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
from PartSegCore.segmentation.segmentation_algorithm import (
CellFromNucleusFlow,
StackAlgorithm,
ThresholdFlowAlgorithm,
ThresholdFlowAlgorithmParameters,
)
from PartSegCore.segmentation.threshold import (
BaseThreshold,
Expand Down Expand Up @@ -626,3 +628,56 @@ def maximum_projection(
},
)
)


class ThresholdFlowAlgorithmParametersWithDilation(
ThresholdFlowAlgorithmParameters
):
dilation_radius: int = Field(
0,
title="Dilation radius",
description="Radius of dilation applied to the mask",
ge=0,
le=100,
)


class ThresholdFlowAlgorithmWithDilation(ThresholdFlowAlgorithm):
new_parameters: ThresholdFlowAlgorithmParametersWithDilation
__argument_class__ = ThresholdFlowAlgorithmParametersWithDilation

@classmethod
def get_name(cls) -> str:
return "Threshold Flow with Dilation"

@classmethod
def get_steps_num(cls) -> int:
return ThresholdFlowAlgorithm.get_steps_num() + 1

def calculation_run(
self, report_fun: Callable[[str, int], None]
) -> ROIExtractionResult:
res = super().calculation_run(report_fun)
if self.new_parameters.dilation_radius == 0:
return res

report_fun("Dilate ROI", self.get_steps_num() - 1)

from PartSegCore.image_operations import dilate

rad = self.new_parameters.dilation_radius
roi = dilate(res.roi, [rad, rad], True)

roi[res.roi > 0] = res.roi[res.roi > 0]

res2 = ROIExtractionResult(
roi=roi,
parameters=self.get_segmentation_profile(),
additional_layers=deepcopy(res.additional_layers),
)

res2.additional_layers["dilated roi"] = AdditionalLayerDescription(
res.roi, "labels", "Dilated ROI"
)
report_fun("Calculation done", self.get_steps_num())
return res2