X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FParasitesMarker.fs;h=d1a51fa870ed8f6d0c7433452419ca0ef4ec71c7;hp=fde0afe4601110e061f98f8b4f4aa32636a5920a;hb=84fdf7404133803fdf0dc867a4da68a144975191;hpb=06bd63d8c01100c28873dfafd59b5efccbfb67e4

diff --git a/Parasitemia/Parasitemia/ParasitesMarker.fs b/Parasitemia/Parasitemia/ParasitesMarker.fs
index fde0afe..d1a51fa 100644
--- a/Parasitemia/Parasitemia/ParasitesMarker.fs
+++ b/Parasitemia/Parasitemia/ParasitesMarker.fs
@@ -10,30 +10,33 @@ type Result = {
     stain: Image<Gray, byte>
     infection: Image<Gray, byte> }
 
-let find (green: Image<Gray, float32>) (filteredGreen: Image<Gray, float32>) (kmediansResult: KMedians.Result) (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 =
 
     // 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 } = kmediansResult
-    let darkStain = d_fg.Cmp(median_bg * config.darkStainLevel, CvEnum.CmpType.GreaterThan)
+    let darkStain = d_fg.Cmp(median_bg * config.Parameters.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()
+    use greenWithoutBg = ImgTools.gaussianFilter green 1.0
     greenWithoutBg.SetValue(Gray(0.0), fg.Not())
 
-    let findSmears (sigma: float) (level: float) : Image<Gray, byte> =       
-        let greenWithoutBgSmoothed = ImgTools.gaussianFilter greenWithoutBg sigma
-        let fgSmoothed = ImgTools.gaussianFilter fgFloat sigma
-
+    let findSmears (sigma: float) (level: float) : Image<Gray, byte> =
+        use greenWithoutBgSmoothed = ImgTools.gaussianFilter greenWithoutBg sigma
+        use 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 }
-    
+      stain = findSmears config.Parameters.stainSigma config.Parameters.stainLevel
+      infection = findSmears config.Parameters.infectionSigma config.Parameters.infectionLevel }*)
+