Merge branch 'main' into 488-impose-minima

WilhelmusLab · Nov 8, 2024 · a13b0ed · a13b0ed
2 parents 6f3c44c + 93f8880
commit a13b0ed
Show file tree

Hide file tree

Showing 10 changed files with 671 additions and 157 deletions.
diff --git a/src/IceFloeTracker.jl b/src/IceFloeTracker.jl
@@ -71,10 +71,9 @@ include("branch.jl")
 include("special_strels.jl")
 include("tilingutils.jl")
 include("histogram_equalization.jl")
+include("morph_fill.jl")
 include("imcomplement.jl")
 
-
-
 function get_version_from_toml(pth=dirname(dirname(pathof(IceFloeTracker))))::VersionNumber
     toml = TOML.parsefile(joinpath(pth, "Project.toml"))
     return VersionNumber(toml["version"])
@@ -158,34 +157,34 @@ julia> IceFloeTracker.MorphSE.dilate(a, se)
 ```
 """
 module MorphSE
-using ImageCore
-using ColorTypes
-using LoopVectorization
-using OffsetArrays
-using TiledIteration: EdgeIterator
-using DataStructures
-include("morphSE/StructuringElements.jl")
-using .StructuringElements
-include("morphSE/extreme_filter.jl")
-include("morphSE/utils.jl")
-include("morphSE/dilate.jl")
-include("morphSE/erode.jl")
-include("morphSE/opening.jl")
-include("morphSE/closing.jl")
-include("morphSE/bothat.jl")
-include("morphSE/mreconstruct.jl")
-include("morphSE/fill_holes.jl")
+    using ImageCore
+    using ColorTypes
+    using LoopVectorization
+    using OffsetArrays
+    using TiledIteration: EdgeIterator
+    using DataStructures
+    include("morphSE/StructuringElements.jl")
+    using .StructuringElements
+    include("morphSE/extreme_filter.jl")
+    include("morphSE/utils.jl")
+    include("morphSE/dilate.jl")
+    include("morphSE/erode.jl")
+    include("morphSE/opening.jl")
+    include("morphSE/closing.jl")
+    include("morphSE/bothat.jl")
+    include("morphSE/mreconstruct.jl")
+    include("morphSE/fill_holes.jl")
 end
 
 module Register
-include("Register/CenterIndexedArrays.jl-0.2.0/CenterIndexedArrays.jl")
-include("Register/RegisterCore.jl-0.2.4/src/RegisterCore.jl")
-include("Register/RegisterMismatchCommon.jl-master/RegisterMismatchCommon.jl")
-include("Register/RegisterUtilities.jl-master/RegisterUtilities.jl")
-include("Register/RFFT.jl-master/RFFT.jl")
-include("Register/RegisterDeformation.jl-0.4.4/RegisterDeformation.jl")
-include("Register/QuadDIRECT.jl-master/QuadDIRECT.jl")
-include("Register/RegisterQD.jl-0.3.1/RegisterQD.jl")
-include("Register/RegisterMismatch.jl-0.4.0/RegisterMismatch.jl")
+    include("Register/CenterIndexedArrays.jl-0.2.0/CenterIndexedArrays.jl")
+    include("Register/RegisterCore.jl-0.2.4/src/RegisterCore.jl")
+    include("Register/RegisterMismatchCommon.jl-master/RegisterMismatchCommon.jl")
+    include("Register/RegisterUtilities.jl-master/RegisterUtilities.jl")
+    include("Register/RFFT.jl-master/RFFT.jl")
+    include("Register/RegisterDeformation.jl-0.4.4/RegisterDeformation.jl")
+    include("Register/QuadDIRECT.jl-master/QuadDIRECT.jl")
+    include("Register/RegisterQD.jl-0.3.1/RegisterQD.jl")
+    include("Register/RegisterMismatch.jl-0.4.0/RegisterMismatch.jl")
 end
 end
diff --git a/src/bridge.jl b/src/bridge.jl
@@ -9,7 +9,8 @@ function _bridge_operator_lut(
     return _operator_lut(I, img, nhood, lutbridge)
 end
 
-function _bridge_filter(img::T, operator::Function)::T where {T<:AbstractArray{Bool}}
+# TODO: see about implemting _filter using parallelization
+function _filter(img::T, operator::Function)::T where {T<:AbstractArray{Bool}}
     out = zeros(Bool, size(img))
     R = CartesianIndices(img)
     I_first, I_last = first(R), last(R)
@@ -79,5 +80,5 @@ julia> bridge(bw)
 ```
 """
 function bridge(bw::T)::T where {T<:AbstractArray{Bool}}
-    return _bridge_filter(bw, _bridge_operator_lut)
+    return _filter(bw, _bridge_operator_lut)
 end