X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FImageAnalysis.fs;h=feb427dff9567383629c46fb359efdd333883835;hp=21616af998206b0db498bbbfb18d7cc40444c34f;hb=d9a6e072ecf299db691c05bb559a71265f812ba3;hpb=06bd63d8c01100c28873dfafd59b5efccbfb67e4 diff --git a/Parasitemia/Parasitemia/ImageAnalysis.fs b/Parasitemia/Parasitemia/ImageAnalysis.fs index 21616af..feb427d 100644 --- a/Parasitemia/Parasitemia/ImageAnalysis.fs +++ b/Parasitemia/Parasitemia/ImageAnalysis.fs @@ -98,7 +98,10 @@ let doAnalysis (img: Image) (config: Config) : Classifier.Cell list = let windowSize = roundInt (1.6 * (snd radiusRange)) let factorNbPick = 1.5 let ellipses = logTime "Finding ellipses" (fun () -> - Ellipse.find edges xEdges yEdges radiusRange windowSize factorNbPick) + Ellipse.find edges xEdges yEdges radiusRange windowSize factorNbPick) |> List.filter (fun e -> not (e.CutAVericalLine 0.0) && + not (e.CutAVericalLine (float img.Width)) && + not (e.CutAnHorizontalLine 0.0) && + not (e.CutAnHorizontalLine (float img.Height))) drawEllipses img ellipses (Bgr(0.0, 255.0, 255.0)) //saveImg img "ellipses.png"