X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FMainAnalysis.fs;h=fd341ac5c44d22445229deba12fbe614dab61ab7;hb=785a7ea4885e87d76f0b1fb1c715230a08389558;hp=6f78b7cc1229a75edd2ef68f9a28decfc37e7932;hpb=6d99ab0dadc57e91cd846844b620fc90b52a2f96;p=master-thesis.git

diff --git a/Parasitemia/Parasitemia/MainAnalysis.fs b/Parasitemia/Parasitemia/MainAnalysis.fs
index 6f78b7c..fd341ac 100644
--- a/Parasitemia/Parasitemia/MainAnalysis.fs
+++ b/Parasitemia/Parasitemia/MainAnalysis.fs
@@ -30,15 +30,19 @@ let doAnalysis (img: Image<Bgr, byte>) (name: string) (config: Config) : Cell li
     let greenOpen1 = filteredGreen.Copy()
     logTime "areaOpen1" (fun () -> ImgTools.areaOpen greenOpen1 2000)*)
 
-    logTime "areaOpen" (fun () -> ImgTools.areaOpen filteredGreen 2000)
+    let initialAreaOpen = 2000
+    logTime "areaOpen 1" (fun () -> ImgTools.areaOpen filteredGreen 2000)
 
     config.RBCRadius <- Granulometry.findRadius filteredGreen (10, 100) 0.5 |> float
 
-    let filteredGreenFloat = filteredGreen.Convert<Gray, float32>() // Is it neccessary?
+    let secondAreaOpen = int <| config.RBCArea / 3.
+    if secondAreaOpen > initialAreaOpen
+    then
+        logTime "areaOpen 2" (fun () -> ImgTools.areaOpen filteredGreen secondAreaOpen)
 
-    let kmediansResults = logTime "Finding foreground (k-medians)" (fun () -> KMedians.kmedians filteredGreenFloat 1.0)
+    let filteredGreenFloat = filteredGreen.Convert<Gray, float32>() // Is it neccessary?
 
-    let parasites, filteredGreenWhitoutInfection, filteredGreenWhitoutStain = ParasitesMarker2.find filteredGreen filteredGreenFloat kmediansResults config
+    let parasites, filteredGreenWhitoutInfection, filteredGreenWhitoutStain = ParasitesMarker2.find filteredGreen filteredGreenFloat config
     let filteredGreenWhitoutInfectionFloat = filteredGreenWhitoutInfection.Convert<Gray, float32>()
     let filteredGreenWhitoutStainFloat = filteredGreenWhitoutStain.Convert<Gray, float32>()
 
@@ -108,7 +112,7 @@ let doAnalysis (img: Image<Bgr, byte>) (name: string) (config: Config) : Cell li
         drawEllipses imgEllipses ellipses (Bgr(0.0, 240.0, 240.0)) 1.0
         saveImg imgEllipses (buildFileName " - ellipses.png")
 
-        saveImg (kmediansResults.fg * 255.0) (buildFileName " - foreground.png")
+        // saveImg (kmediansResults.fg * 255.0) (buildFileName " - foreground.png")
 
         let imgCells = img.Copy()
         drawCells imgCells false cells
@@ -124,7 +128,8 @@ let doAnalysis (img: Image<Bgr, byte>) (name: string) (config: Config) : Cell li
         saveImg filteredGreenMaxima (buildFileName " - filtered - maxima.png")
 
         saveImg filteredGreen (buildFileName " - filtered.png")
-        saveImg filteredGreenWhitoutStain (buildFileName " - filtered closed.png")
+        saveImg filteredGreenWhitoutStain (buildFileName " - filtered closed stain.png")
+        saveImg filteredGreenWhitoutInfection (buildFileName " - filtered closed infection.png")
 
         (*saveImg parasitesMarker (buildFileName " - parasites (area closing).png")
         saveImg stainMarker (buildFileName " - stain (area closing).png")*)