X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FParasitesMarker.fs;h=9adf1850513f69aee3ea5ce96c1985b5109e6961;hp=e422b04d92fa4fbd92ea56b1d3b382cad4fc36f0;hb=10afa9a402eb88c8e073fe8b0d607faa25230eef;hpb=5b68d946369f998865d2dd330fd3b374b2b9a0ad diff --git a/Parasitemia/Parasitemia/ParasitesMarker.fs b/Parasitemia/Parasitemia/ParasitesMarker.fs index e422b04..9adf185 100644 --- a/Parasitemia/Parasitemia/ParasitesMarker.fs +++ b/Parasitemia/Parasitemia/ParasitesMarker.fs @@ -16,8 +16,6 @@ type Result = { // * 'Infection' corresponds to the parasite. It shouldn't contain thrombocytes. let find (green: Image) (filteredGreen: Image) (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 } = kmediansResult let darkStain = d_fg.Cmp(median_bg * config.darkStainLevel, CvEnum.CmpType.GreaterThan) @@ -25,13 +23,12 @@ let find (green: Image) (filteredGreen: Image) (km darkStain._And(fg) let fgFloat = (fg / 255.0).Convert() - 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 = - let greenWithoutBgSmoothed = ImgTools.gaussianFilter greenWithoutBg sigma - let fgSmoothed = ImgTools.gaussianFilter fgFloat sigma - + 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