X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=Parasitemia%2FParasitemiaCore%2FImgTools.fs;h=cbb65b4d5368168dc7c55ab1167b683b19340e6e;hb=e3842630f4d36c5ea8c8a0c3d4762684e1c510f4;hp=3fb8ecfc114ff74eddac4791852e2a5df2205226;hpb=c4a76a01f62568c6353396ff85551a3151fc5236;p=master-thesis.git

diff --git a/Parasitemia/ParasitemiaCore/ImgTools.fs b/Parasitemia/ParasitemiaCore/ImgTools.fs
index 3fb8ecf..cbb65b4 100644
--- a/Parasitemia/ParasitemiaCore/ImgTools.fs
+++ b/Parasitemia/ParasitemiaCore/ImgTools.fs
@@ -13,14 +13,43 @@ open Const
 open Types
 open Utils
 
-// Normalize image values between 0uy and 255uy.
-let normalizeAndConvert (img: Image<Gray, 'TDepth>) : Image<Gray, byte> =
+let normalize (img: Image<Gray, float32>) (upperLimit: float) : Image<Gray, float32> =
     let min = ref [| 0.0 |]
     let minLocation = ref <| [| Point() |]
     let max = ref [| 0.0 |]
     let maxLocation = ref <| [| Point() |]
     img.MinMax(min, max, minLocation, maxLocation)
-    ((img.Convert<Gray, float32>() - (!min).[0]) / ((!max).[0] - (!min).[0]) * 255.0).Convert<Gray, byte>()
+    let normalized = (img - (!min).[0]) / ((!max).[0] - (!min).[0])
+    if upperLimit = 1.0
+    then normalized
+    else upperLimit * normalized
+
+let mergeChannels (img: Image<Bgr, float32>) (rgbWeights: float * float * float) : Image<Gray, float32> =
+    match rgbWeights with
+    | 1., 0., 0. -> img.[2]
+    | 0., 1., 0. -> img.[1]
+    | 0., 0., 1. -> img.[0]
+    | redFactor, greenFactor, blueFactor ->
+        let result = new Image<Gray, float32>(img.Size)
+        CvInvoke.AddWeighted(result, 1., img.[2], redFactor, 0., result)
+        CvInvoke.AddWeighted(result, 1., img.[1], greenFactor, 0., result)
+        CvInvoke.AddWeighted(result, 1., img.[0], blueFactor, 0., result)
+        result
+
+let mergeChannelsWithProjection (img: Image<Bgr, float32>) (v1r: float32, v1g: float32, v1b: float32) (v2r: float32, v2g: float32, v2b: float32) (upperLimit: float)  : Image<Gray, float32> =
+    let vr, vg, vb = v2r - v1r, v2g - v1g, v2b - v1b
+    let vMagnitude = sqrt (vr ** 2.f + vg ** 2.f + vb ** 2.f)
+    let project (r: float32) (g: float32) (b: float32) = ((r - v1r) * vr + (g - v1g) * vg + (b - v1b) * vb) / vMagnitude
+    let result = new Image<Gray, float32>(img.Size)
+    // TODO: Essayer en bindant Data pour gagner du temps
+    for i in 0 .. img.Height - 1 do
+        for j in 0 .. img.Width - 1 do
+            result.Data.[i, j, 0] <- project img.Data.[i, j, 2] img.Data.[i, j, 1] img.Data.[i, j, 0]
+    normalize result upperLimit
+
+// Normalize image values between 0uy and 255uy.
+let normalizeAndConvert (img: Image<Gray, 'TDepth>) : Image<Gray, byte> =
+    (normalize (img.Convert<Gray, float32>()) 255.).Convert<Gray, byte>()
 
 let saveImg (img: Image<'TColor, 'TDepth>) (filepath: string) =
     img.Save(filepath)
@@ -107,7 +136,7 @@ let otsu (hist: Histogram) : float32 * float32 * float32 =
     let mutable wB = 0
     let mutable maximum = 0.0
     let mutable level = 0
-    let sum = hist.data |> Array.mapi (fun i v -> i * v) |> Array.sum |> float
+    let sum = hist.data |> Array.mapi (fun i v -> i * v |> float) |> Array.sum
 
     for i in 0 .. hist.data.Length - 1 do
         wB <- wB + hist.data.[i]
@@ -720,12 +749,13 @@ let private areaOperationF (img: Image<Gray, float32>) (areas: (int * 'a) list)
                 else
                     if not <| Object.ReferenceEquals(other, null)
                     then // We touching another island.
-                        if island.IsInfinite || other.IsInfinite || island.Surface + other.Surface >= area
+                        if island.IsInfinite || other.IsInfinite || island.Surface + other.Surface >= area || comparer.Compare(island.Level, other.Level) < 0
                         then
                             stop <- true
                         else // We can merge 'other' into 'surface'.
                             island.Surface <- island.Surface + other.Surface
-                            island.Level <- if comparer.Compare(island.Level, other.Level) > 0 then island.Level else other.Level
+                            island.Level <- other.Level
+                            // island.Level <- if comparer.Compare(island.Level, other.Level) > 0 then other.Level else island.Level
                             for l, p in other.Shore do
                                 let mutable currentY = p.Y + 1
                                 while currentY < h && ownership.[currentY, p.X] = other do