X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemiaCore%2FMainAnalysis.fs;h=5a8e16db92500671c0af978a46f48cd5fd60eb08;hp=cae64279bf0b8f3b71c2c066ee13adf8285535bf;hb=828e126c88524d3dc123abc966a132532aed118b;hpb=3b645f8ff5259f88a33ffbd9a63b10a8640c439f

diff --git a/Parasitemia/ParasitemiaCore/MainAnalysis.fs b/Parasitemia/ParasitemiaCore/MainAnalysis.fs
index cae6427..5a8e16d 100644
--- 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_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
-        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)
 
@@ -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")
-                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