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

diff --git a/Parasitemia/Parasitemia/MainAnalysis.fs b/Parasitemia/Parasitemia/MainAnalysis.fs
index 6111f06..ec2aabb 100644
--- a/Parasitemia/Parasitemia/MainAnalysis.fs
+++ b/Parasitemia/Parasitemia/MainAnalysis.fs
@@ -13,59 +13,30 @@ open Types
 
 
 let doAnalysis (img: Image<Bgr, byte>) (name: string) (config: Config) : Cell list =
-
-    use scaledImg = if config.Parameters.scale = 1.0 then img else img.Resize(config.Parameters.scale, CvEnum.Inter.Area)
+    let scaledImg = if config.Parameters.scale = 1.0 then img else img.Resize(config.Parameters.scale, CvEnum.Inter.Area)
 
     use green = scaledImg.Item(1)
-
     let greenFloat = green.Convert<Gray, float32>()
+    let filteredGreen = gaussianFilter greenFloat (float config.Parameters.preFilterSigma)
 
-    let filteredGreen = gaussianFilter green config.Parameters.preFilterSigma
-
-    (*let maximaImg = filteredGreen.Copy()
-    let maxima = logTime "maxima" (fun () -> ImgTools.findMaxima maximaImg)
-    for m in maxima do
-        ImgTools.drawPoints maximaImg m 255uy
+    logTime "areaOpen 1" (fun () -> ImgTools.areaOpenF filteredGreen config.Parameters.initialAreaOpen)
 
-    let greenOpen1 = filteredGreen.Copy()
-    logTime "areaOpen1" (fun () -> ImgTools.areaOpen greenOpen1 2000)*)
+    config.RBCRadius <- logTime "Granulometry" (fun() -> Granulometry.findRadius (filteredGreen.Convert<Gray, byte>()) (10, 100) 0.3 |> float32)
 
-    let initialAreaOpen = 2000
-    logTime "areaOpen 1" (fun () -> ImgTools.areaOpen filteredGreen 2000)
-
-    config.RBCRadius <- Granulometry.findRadius filteredGreen (10, 100) 0.5 |> float
-
-    let secondAreaOpen = int <| config.RBCArea / 3.
-    if secondAreaOpen > initialAreaOpen
+    let secondAreaOpen = int <| config.RBCArea / 3.f
+    if secondAreaOpen > config.Parameters.initialAreaOpen
     then
-        logTime "areaOpen 2" (fun () -> ImgTools.areaOpen filteredGreen secondAreaOpen)
-
-    let filteredGreenFloat = filteredGreen.Convert<Gray, float32>() // Is it neccessary?
+        logTime "areaOpen 2" (fun () -> ImgTools.areaOpenF filteredGreen secondAreaOpen)
 
-    let parasites, filteredGreenWhitoutInfection, filteredGreenWhitoutStain = ParasitesMarker.find filteredGreen filteredGreenFloat config
+    let parasites, filteredGreenWhitoutStain = ParasitesMarker.find filteredGreen config
     //let parasites, filteredGreenWhitoutInfection, filteredGreenWhitoutStain = ParasitesMarker.findMa greenFloat filteredGreenFloat config
-    let filteredGreenWhitoutInfectionFloat = filteredGreenWhitoutInfection.Convert<Gray, float32>()
-    let filteredGreenWhitoutStainFloat = filteredGreenWhitoutStain.Convert<Gray, float32>()
 
-    (*let min = ref 0.0
-    let minLocation = ref <| Point()
-    let max = ref 0.0
-    let maxLocation = ref <| Point()
-    magnitudes.MinMax(min, max, minLocation, maxLocation)
-
-    use magnitudesByte = ((magnitudes / !max) * 255.0).Convert<byte>() // Otsu from OpenCV only support 'byte'.
-    use edges = new Matrix<byte>(xEdges.Size)
-    CvInvoke.Threshold(magnitudesByte, edges, 0.0, 1.0, CvEnum.ThresholdType.Otsu ||| CvEnum.ThresholdType.Binary) |> ignore
-
-    logTime "Finding edges" (fun() -> thin edges)*)
-
-    let edges, xGradient, yGradient = ImgTools.findEdges filteredGreenWhitoutStainFloat
-
-    logTime "Removing small connected components from thinning" (fun () -> removeArea edges 12)
+    let edges, xGradient, yGradient = logTime "Finding edges" (fun () -> ImgTools.findEdges filteredGreenWhitoutStain)
+    logTime "Removing small connected components from thinning" (fun () -> removeArea edges (config.RBCRadius ** 2.f / 50.f |> int))
 
     let allEllipses, ellipses = logTime "Finding ellipses" (fun () ->
         let matchingEllipses = Ellipse.find edges xGradient yGradient config
-        matchingEllipses.Ellipses, matchingEllipses.PrunedEllipses )
+        matchingEllipses.Ellipses, matchingEllipses.PrunedEllipses)
 
     let cells = logTime "Classifier" (fun () -> Classifier.findCells ellipses parasites filteredGreenWhitoutStain config)
 
@@ -91,8 +62,6 @@ 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")
-
         let imgCells = img.Copy()
         drawCells imgCells false cells
         saveImg imgCells (buildFileName " - cells.png")
@@ -101,17 +70,14 @@ let doAnalysis (img: Image<Bgr, byte>) (name: string) (config: Config) : Cell li
         drawCells imgCells' true cells
         saveImg imgCells' (buildFileName " - cells - full.png")
 
-        let filteredGreenMaxima = gaussianFilter green config.Parameters.preFilterSigma
+        let filteredGreenMaxima = gaussianFilter greenFloat config.Parameters.preFilterSigma
         for m in ImgTools.findMaxima filteredGreenMaxima do
-            ImgTools.drawPoints filteredGreenMaxima m 255uy
+            ImgTools.drawPoints filteredGreenMaxima m 255.f
         saveImg filteredGreenMaxima (buildFileName " - filtered - maxima.png")
 
         saveImg filteredGreen (buildFileName " - filtered.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")*)
+        //saveImg filteredGreenWhitoutInfection (buildFileName " - filtered closed infection.png")
 
         saveImg green (buildFileName " - green.png")