projects
/
master-thesis.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove the parasite detection function from Ma.
[master-thesis.git]
/
Parasitemia
/
ParasitemiaCore
/
MainAnalysis.fs
diff --git
a/Parasitemia/ParasitemiaCore/MainAnalysis.fs
b/Parasitemia/ParasitemiaCore/MainAnalysis.fs
index
cae6427
..
5a8e16d
100644
(file)
--- a/
Parasitemia/ParasitemiaCore/MainAnalysis.fs
+++ b/
Parasitemia/ParasitemiaCore/MainAnalysis.fs
@@
-53,11
+53,11
@@
let doAnalysis (img: Image<Bgr, byte>) (name: string) (config: Config) (reportPr
use img_float = img.Convert<Bgr, float32>()
// use img_RBC = mergeChannels img_float config.Parameters.colorContribution_BG_RBC
use img_float = img.Convert<Bgr, float32>()
// use img_RBC = mergeChannels img_float config.Parameters.colorContribution_BG_RBC
- use img_RBC = mergeChannelsWithProjection img_float
(94.7f, 80.7f, 99.3f) (113.3f, 135.3f, 150.3f)
255.
+ use img_RBC = mergeChannelsWithProjection img_float
config.Parameters.averageColor_RBC config.Parameters.averageColor_BG
255.
let img_RBC_filtered = gaussianFilter img_RBC config.LPFStandardDeviationRBC
//use img_parasites = mergeChannels img_float config.Parameters.colorContribution_RBC_parasite
let img_RBC_filtered = gaussianFilter img_RBC config.LPFStandardDeviationRBC
//use img_parasites = mergeChannels img_float config.Parameters.colorContribution_RBC_parasite
- use img_parasites = mergeChannelsWithProjection img_float
(76.f, 58.f, 94.f) (94.7f, 80.7f, 99.3f)
255.
+ use img_parasites = mergeChannelsWithProjection img_float
config.Parameters.averageColor_Parasite config.Parameters.averageColor_RBC
255.
logWithName (sprintf "Nominal erytrocyte diameter: %A" config.RBCRadiusByResolution)
logWithName (sprintf "Nominal erytrocyte diameter: %A" config.RBCRadiusByResolution)
@@
-114,8
+114,8
@@
let doAnalysis (img: Image<Bgr, byte>) (name: string) (config: Config) (reportPr
saveMat (edges * 255.0) (buildFileName " - edges.png")
saveImg parasites.darkStain (buildFileName " - parasites - dark stain.png")
saveMat (edges * 255.0) (buildFileName " - edges.png")
saveImg parasites.darkStain (buildFileName " - parasites - dark stain.png")
- saveImg parasites.
stain
(buildFileName " - parasites - stain.png")
- saveImg parasites.
infection
(buildFileName " - parasites - infection.png")
+ saveImg parasites.
cytoplasm
(buildFileName " - parasites - stain.png")
+ saveImg parasites.
nucleus
(buildFileName " - parasites - infection.png")
let imgAllEllipses = img.Copy()
drawEllipses imgAllEllipses matchingEllipses.Ellipses (Bgr(255.0, 255.0, 255.0)) 0.04
let imgAllEllipses = img.Copy()
drawEllipses imgAllEllipses matchingEllipses.Ellipses (Bgr(255.0, 255.0, 255.0)) 0.04