X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FMainAnalysis.fs;h=9f91a6d3a143f229d4f0f38e2651980c6c0b9814;hp=ec2aabb9953f8ef789f0ac98b92289128191381b;hb=6b550c3faf4dea77738fa5c27cd9af277f45549c;hpb=044b0ae69df3ac565432545b2fa934589016f9bd

diff --git a/Parasitemia/Parasitemia/MainAnalysis.fs b/Parasitemia/Parasitemia/MainAnalysis.fs
index ec2aabb..9f91a6d 100644
--- a/Parasitemia/Parasitemia/MainAnalysis.fs
+++ b/Parasitemia/Parasitemia/MainAnalysis.fs
@@ -13,9 +13,7 @@ open Types
 
 
 let doAnalysis (img: Image<Bgr, byte>) (name: string) (config: Config) : Cell list =
-    let scaledImg = if config.Parameters.scale = 1.0 then img else img.Resize(config.Parameters.scale, CvEnum.Inter.Area)
-
-    use green = scaledImg.Item(1)
+    use green = img.Item(1)
     let greenFloat = green.Convert<Gray, float32>()
     let filteredGreen = gaussianFilter greenFloat (float config.Parameters.preFilterSigma)
 
@@ -58,7 +56,7 @@ let doAnalysis (img: Image<Bgr, byte>) (name: string) (config: Config) : Cell li
         drawEllipses imgAllEllipses allEllipses (Bgr(0.0, 240.0, 240.0)) 0.05
         saveImg imgAllEllipses (buildFileName " - ellipses - all.png")
 
-        let imgEllipses = img.Copy()
+        let imgEllipses = filteredGreenWhitoutStain.Convert<Bgr, byte>()
         drawEllipses imgEllipses ellipses (Bgr(0.0, 240.0, 240.0)) 1.0
         saveImg imgEllipses (buildFileName " - ellipses.png")
 
@@ -81,10 +79,10 @@ let doAnalysis (img: Image<Bgr, byte>) (name: string) (config: Config) : Cell li
 
         saveImg green (buildFileName " - green.png")
 
-        use blue  = scaledImg.Item(0)
+        use blue = img.Item(0)
         saveImg blue (buildFileName " - blue.png")
 
-        use red = scaledImg.Item(2)
+        use red = img.Item(2)
         saveImg red (buildFileName " - red.png")
     | _ -> ()