X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemiaCore%2FParasitesMarker.fs;h=b89caa68c02760b2dc4af0af0be28b48d4d12a1a;hp=263e35ef60a2724e646673c311235ee36366d722;hb=2d712781def419c9acc98368f7102b19b064f16d;hpb=d715615d0b1da40fd10e9dbabbd4530cd5125a19

diff --git a/Parasitemia/ParasitemiaCore/ParasitesMarker.fs b/Parasitemia/ParasitemiaCore/ParasitesMarker.fs
index 263e35e..b89caa6 100644
--- a/Parasitemia/ParasitemiaCore/ParasitesMarker.fs
+++ b/Parasitemia/ParasitemiaCore/ParasitesMarker.fs
@@ -21,7 +21,7 @@ type Result =
 
 let find (img : Image<Gray, float32>) (config : Config.Config) : Result * Image<Gray, float32> * Image<Gray, float32> =
 
-    let imgWithoutNucleus = img.Copy()
+    let imgWithoutNucleus = img.Copy ()
     areaCloseF imgWithoutNucleus (roundInt config.RBCRadius.NucleusArea)
 
     let darkStain =
@@ -29,30 +29,30 @@ let find (img : Image<Gray, float32>) (config : Config.Config) : Result * Image<
         let _, mean_fg, mean_bg =
             let hist = histogramImg imgWithoutNucleus 300
             otsu hist
-        imgWithoutNucleus.Cmp(float mean_fg - config.Parameters.darkStainLevel * float (mean_bg - mean_fg), CvEnum.CmpType.LessThan)
+        imgWithoutNucleus.Cmp (float mean_fg - config.Parameters.darkStainLevel * float (mean_bg - mean_fg), CvEnum.CmpType.LessThan)
 
     let marker (img : Image<Gray, float32>) (closed : Image<Gray, float32>) (level : float) : Image<Gray, byte> =
-        let diff = img.Copy()
-        diff._Mul(level)
-        CvInvoke.Subtract(closed, diff, diff)
-        diff._ThresholdBinary(Gray(0.0), Gray(255.))
-        diff.Convert<Gray, byte>()
+        let diff = img.Copy ()
+        diff._Mul level
+        CvInvoke.Subtract (closed, diff, diff)
+        diff._ThresholdBinary (Gray 0.0, Gray 255.)
+        diff.Convert<Gray, byte> ()
 
     // Nucleus.
     let nucleusMarker = marker img imgWithoutNucleus (1. / config.Parameters.infectionSensitivity)
 
     // Cytoplasm.
-    let imgWithoutParasite = img.CopyBlank()
+    let imgWithoutParasite = img.CopyBlank ()
     let kernelSize =
         let size = roundInt config.RBCRadius.CytoplasmSize
         if size % 2 = 0 then size + 1 else size
     use kernel =
         if kernelSize <= 3 then
-            CvInvoke.GetStructuringElement(CvEnum.ElementShape.Rectangle, Size(3, 3), Point(-1, -1))
+            CvInvoke.GetStructuringElement (CvEnum.ElementShape.Rectangle, Size (3, 3), Point (-1, -1))
         else
-            CvInvoke.GetStructuringElement(CvEnum.ElementShape.Ellipse, Size(kernelSize, kernelSize), Point(-1, -1))
+            CvInvoke.GetStructuringElement (CvEnum.ElementShape.Ellipse, Size (kernelSize, kernelSize), Point (-1, -1))
 
-    CvInvoke.MorphologyEx(img, imgWithoutParasite, CvEnum.MorphOp.Close, kernel, Point(-1, -1), 1, CvEnum.BorderType.Replicate, MCvScalar())
+    CvInvoke.MorphologyEx (img, imgWithoutParasite, CvEnum.MorphOp.Close, kernel, Point(-1, -1), 1, CvEnum.BorderType.Replicate, MCvScalar())
     let parasiteMarker = marker img imgWithoutParasite (1. / config.Parameters.cytoplasmSensitivity)
 
     {