X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FGranulometry.fs;h=78860435f4ca01ad677ee1db738d829c973be747;hb=3ddaf64dc5ba6a7066a279ad75b9a1ee72194639;hp=db299dc6a0b904fad9f66da25523605697724139;hpb=5ac2dedf8ead5275ac216e0b41829ab39c843800;p=master-thesis.git

diff --git a/Parasitemia/Parasitemia/Granulometry.fs b/Parasitemia/Parasitemia/Granulometry.fs
index db299dc..7886043 100644
--- a/Parasitemia/Parasitemia/Granulometry.fs
+++ b/Parasitemia/Parasitemia/Granulometry.fs
@@ -10,8 +10,8 @@ open Utils
 
 // 'range': a minimum and maximum radius.
 // 'scale': <= 1.0, to speed up the process.
-let findRadius (img: Image<Gray, byte>) (range: int * int) (scale: float) : int =
-    use scaledImg = if scale = 1.0 then img else img.Resize(scale, CvEnum.Inter.Area)
+let findRadiusByClosing (img: Image<Gray, 'TDepth>) (range: int * int) (scale: float) : int =
+    use scaledImg = if scale = 1. then img else img.Resize(scale, CvEnum.Inter.Area)
 
     let r1, r2 = range
     let r1', r2' = roundInt (float r1 * scale), roundInt (float r2 * scale)
@@ -19,9 +19,26 @@ let findRadius (img: Image<Gray, byte>) (range: int * int) (scale: float) : int
     let patternSpectrum = Array.zeroCreate (r2' - r1')
     let intensityImg = scaledImg.GetSum().Intensity
 
+    // 's' must be odd.
+    let octagon (s: int) : Matrix<byte> =
+        if s % 2 = 0 then failwith "s must be odd"
+        let m = new Matrix<byte>(Array2D.create s s 1uy)
+        let r = (float s) / (Math.Sqrt 2. + 2.) |> roundInt
+        for i in 0 .. r - 1 do
+            for j in 0 .. r - 1 do
+                if i + j < r
+                then
+                    m.[i, j] <- 0uy
+                    m.[s - i - 1, j] <- 0uy
+                    m.[i, s - j - 1] <- 0uy
+                    m.[s - i - 1, s - j - 1] <- 0uy
+        m
+
     let mutable previous_n = Double.NaN
     for r in r1' .. r2' do
         let se = CvInvoke.GetStructuringElement(CvEnum.ElementShape.Ellipse, Size(2 * r, 2 * r), Point(-1, -1))
+        //let se = octagon (2 * r - 1)
+
         use closed = scaledImg.MorphologyEx(CvEnum.MorphOp.Close, se, Point(-1, -1), 1, CvEnum.BorderType.Replicate, MCvScalar(0.0))
 
         let n = closed.GetSum().Intensity
@@ -36,3 +53,18 @@ let findRadius (img: Image<Gray, byte>) (range: int * int) (scale: float) : int
     float (max + r1') / scale |> roundInt
 
 
+let findRadiusByAreaClosing (img: Image<Gray, float32>) (range: int * int) : int =
+    let r1, r2 = range
+
+    use imgCopy = img.Copy()
+
+    let mutable maxDiff = 0.f
+    let mutable max_r = r1
+
+    ImgTools.areaCloseFWithFun imgCopy [ for r in r1 .. r2 -> Math.PI * float r ** 2. |> roundInt, r ] (fun r diff ->
+        if r <> r1 && diff > maxDiff
+        then
+            maxDiff <- diff
+            max_r <- r - 1 )
+    max_r
+