X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FParasitesMarker.fs;h=e422b04d92fa4fbd92ea56b1d3b382cad4fc36f0;hp=44da9011d3b17ab2a458bf030ff2938aeb5466d8;hb=e76da913cd58078ad2479357b2430ed62a6e0777;hpb=dec96d50e56e1932bbfa09e6bedf90d6b707ccbd

diff --git a/Parasitemia/Parasitemia/ParasitesMarker.fs b/Parasitemia/Parasitemia/ParasitesMarker.fs
index 44da901..e422b04 100644
--- a/Parasitemia/Parasitemia/ParasitesMarker.fs
+++ b/Parasitemia/Parasitemia/ParasitesMarker.fs
@@ -10,30 +10,36 @@ type Result = {
     stain: Image<Gray, byte>
     infection: Image<Gray, byte> }
 
-let find (green: Image<Gray, float32>) (filteredGreen: Image<Gray, float32>) (config: Config.Config) : Result =
+// Create three binary markers :
+// * 'Dark stain' corresponds to the colored pixel, it's independent of the size of the areas.
+// * 'Stain' corresponds to the stain around the parasites.
+// * 'Infection' corresponds to the parasite. It shouldn't contain thrombocytes.
+let find (green: Image<Gray, float32>) (filteredGreen: Image<Gray, float32>) (kmediansResult: KMedians.Result) (config: Config.Config) : Result =
+
+    let green = ImgTools.gaussianFilter green 1.0
 
     // We use the filtered image to find the dark stain.
-    let { KMedians.fg = fg; KMedians.median_bg = median_bg; KMedians.median_fg = median_fg; KMedians.d_fg = d_fg } = KMedians.kmedians filteredGreen 1.0
+    let { KMedians.fg = fg; KMedians.median_bg = median_bg; KMedians.median_fg = median_fg; KMedians.d_fg = d_fg } = kmediansResult
     let darkStain = d_fg.Cmp(median_bg * config.darkStainLevel, CvEnum.CmpType.GreaterThan)
     darkStain._And(filteredGreen.Cmp(median_fg, CvEnum.CmpType.LessThan))
     darkStain._And(fg)
-    
+
     let fgFloat = (fg / 255.0).Convert<Gray, float32>()
     let greenWithoutBg = green.Copy()
     greenWithoutBg.SetValue(Gray(0.0), fg.Not())
 
-    let findSmears (sigma: float) (level: float) : Image<Gray, byte> =       
+    let findSmears (sigma: float) (level: float) : Image<Gray, byte> =
         let greenWithoutBgSmoothed = ImgTools.gaussianFilter greenWithoutBg sigma
         let fgSmoothed = ImgTools.gaussianFilter fgFloat sigma
 
         let smears = (greenWithoutBg.Mul(fgSmoothed)).Cmp(greenWithoutBgSmoothed.Mul(level), CvEnum.CmpType.LessThan)
         smears._And(fg)
-        smears    
+        smears
 
     { darkStain = darkStain;
       stain = findSmears config.stainSigma config.stainLevel
       infection = findSmears config.infectionSigma config.infectionLevel }
-    
+