X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemiaCore%2FParasitesMarker.fs;h=73f9fe1da720cc9fe8bb215c823ebee636f87ee5;hp=f4d9f35d0129a246b1fa2ad5662c7c158a8e74ef;hb=3b645f8ff5259f88a33ffbd9a63b10a8640c439f;hpb=db49e167a602ef1df02a8b5f7de334355a4917dd

diff --git a/Parasitemia/ParasitemiaCore/ParasitesMarker.fs b/Parasitemia/ParasitemiaCore/ParasitesMarker.fs
index f4d9f35..73f9fe1 100644
--- a/Parasitemia/ParasitemiaCore/ParasitesMarker.fs
+++ b/Parasitemia/ParasitemiaCore/ParasitesMarker.fs
@@ -52,7 +52,7 @@ let find (img: Image<Gray, float32>) (config: Config.Config) : Result * Image<Gr
 
     let imgFilteredInfection = ImgTools.gaussianFilter img config.LPFStandardDeviationParasite
     let filteredGreenWithoutInfection = imgFilteredInfection.Copy()
-    ImgTools.areaCloseF filteredGreenWithoutInfection (int config.RBCRadius.InfectionArea)
+    ImgTools.areaCloseF filteredGreenWithoutInfection (roundInt config.RBCRadius.NucleusArea)
 
     (*
     let filteredGreenWithoutStain = filteredGreenWithoutInfection.Copy()
@@ -88,8 +88,9 @@ let find (img: Image<Gray, float32>) (config: Config.Config) : Result * Image<Gr
             CvInvoke.GetStructuringElement(CvEnum.ElementShape.Rectangle, Size(3, 3), Point(-1, -1))
         else
             CvInvoke.GetStructuringElement(CvEnum.ElementShape.Ellipse, Size(kernelSize, kernelSize), Point(-1, -1))
+
     CvInvoke.MorphologyEx(imgFilteredStain, filteredGreenWithoutStain, CvEnum.MorphOp.Close, kernel, Point(-1, -1), 1, CvEnum.BorderType.Replicate, MCvScalar())
-    let stainMarker = marker (*filteredGreenWithoutInfection*) imgFilteredStain filteredGreenWithoutStain (1. / config.Parameters.stainSensitivity)
+    let stainMarker = marker (*filteredGreenWithoutInfection*) imgFilteredStain filteredGreenWithoutStain (1. / config.Parameters.cytoplasmSensitivity)
 
     //
     (*let blackTopHat = filteredGreenWithoutStain.CopyBlank()