X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemiaCore%2FGranulometry.fs;h=287cd3ef466d97502473f56b793c787fc3ce6c5f;hp=bbb6d66fd6e88346060bf54638f7b9d458e50c00;hb=2d712781def419c9acc98368f7102b19b064f16d;hpb=d715615d0b1da40fd10e9dbabbd4530cd5125a19
diff --git a/Parasitemia/ParasitemiaCore/Granulometry.fs b/Parasitemia/ParasitemiaCore/Granulometry.fs
index bbb6d66..287cd3e 100644
--- a/Parasitemia/ParasitemiaCore/Granulometry.fs
+++ b/Parasitemia/ParasitemiaCore/Granulometry.fs
@@ -16,7 +16,7 @@ open Utils
/// Minimum radius * maximum radius
/// le 1.0, to speed up the process.
let findRadiusByClosing (img : Image) (range : int * int) (scale : float) (useOctagon : bool) : int =
- use scaledImg = if scale = 1. then img else img.Resize(scale, CvEnum.Inter.Area)
+ 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)
@@ -27,7 +27,7 @@ let findRadiusByClosing (img : Image) (range : int * int) (scale
// 's' must be odd.
let octagon (s : int) : Matrix =
if s % 2 = 0 then failwith "s must be odd"
- let m = new Matrix(Array2D.create s s 1uy)
+ let m = new Matrix (Array2D.create s s 1uy)
let r = (float s) / (Math.Sqrt 2. + 2.) |> roundInt
for i = 0 to r - 1 do
for j = 0 to r - 1 do
@@ -44,9 +44,9 @@ let findRadiusByClosing (img : Image) (range : int * int) (scale
if useOctagon then
(octagon (2 * r - 1)).Mat // It doesn't speed up the process.
else
- CvInvoke.GetStructuringElement(CvEnum.ElementShape.Ellipse, Size(2 * r, 2 * r), Point(-1, -1))
+ CvInvoke.GetStructuringElement (CvEnum.ElementShape.Ellipse, Size (2 * r, 2 * r), Point (-1, -1))
- use closed = scaledImg.MorphologyEx(CvEnum.MorphOp.Close, se, Point(-1, -1), 1, CvEnum.BorderType.Replicate, MCvScalar(0.0))
+ use closed = scaledImg.MorphologyEx (CvEnum.MorphOp.Close, se, Point (-1, -1), 1, CvEnum.BorderType.Replicate, MCvScalar (0.0))
let n = closed.GetSum().Intensity
@@ -67,14 +67,17 @@ let findRadiusByAreaClosing (img : Image) (radiusRange : int * in
if r1 > r2 then
failwithf "'radiusRange' invalid : %O" radiusRange
- use imgCopy = img.Copy()
+ use imgCopy = img.Copy ()
let mutable maxDiff = 0.f
let mutable max_r = r1
- Morpho.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)
+ Morpho.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