X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FMainAnalysis.fs;h=d959624b8b2b7ded61e54a2342b70056a11c8965;hp=39383fcf9d977bfab93698126c3b27a79d977e32;hb=84fdf7404133803fdf0dc867a4da68a144975191;hpb=5ac2dedf8ead5275ac216e0b41829ab39c843800

diff --git a/Parasitemia/Parasitemia/MainAnalysis.fs b/Parasitemia/Parasitemia/MainAnalysis.fs
index 39383fc..d959624 100644
--- a/Parasitemia/Parasitemia/MainAnalysis.fs
+++ b/Parasitemia/Parasitemia/MainAnalysis.fs
@@ -14,31 +14,40 @@ open Types
 
 let doAnalysis (img: Image<Bgr, byte>) (name: string) (config: Config) : Cell list =
 
-    use scaledImg = if config.scale = 1.0 then img else img.Resize(config.scale, CvEnum.Inter.Area)
+    use scaledImg = if config.Parameters.scale = 1.0 then img else img.Resize(config.Parameters.scale, CvEnum.Inter.Area)
 
-    use blue  = scaledImg.Item(0)
     use green = scaledImg.Item(1)
-    use red = scaledImg.Item(2)
 
     let greenFloat = green.Convert<Gray, float32>()
 
-    let filteredGreen = gaussianFilter green config.preFilterSigma
-    logTime "areaOpen" (fun () -> ImgTools.areaOpen filteredGreen 2000)
+    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
 
-    let RBCSize = Granulometry.findRadius filteredGreen (10, 100) 0.5 |> float
-    let RBCSizeDelta = RBCSize / 3.0
+    let greenOpen1 = filteredGreen.Copy()
+    logTime "areaOpen1" (fun () -> ImgTools.areaOpen greenOpen1 2000)*)
+
+    logTime "areaOpen" (fun () -> ImgTools.areaOpen filteredGreen 2000)
 
-    let config = { config with minRBCSize = RBCSize - RBCSizeDelta ; maxRBCSize = RBCSize + RBCSizeDelta }
+    config.RBCSize <- Granulometry.findRadius filteredGreen (10, 100) 0.5 |> float
 
     let filteredGreenFloat = filteredGreen.Convert<Gray, float32>() // Is it neccessary?
 
+    let kmediansResults = logTime "Finding foreground (k-medians)" (fun () -> KMedians.kmedians filteredGreenFloat 1.0)
+
+    let parasites, filteredGreenWhitoutParasites, filteredGreenWhitoutStain = ParasitesMarker2.find filteredGreen filteredGreenFloat kmediansResults config
+    let filteredGreenWhitoutParasitesFloat = filteredGreenWhitoutParasites.Convert<Gray, float32>()
+
     use sobelKernel =
         new ConvolutionKernelF(array2D [[ 1.0f; 0.0f; -1.0f ]
                                         [ 2.0f; 0.0f; -2.0f ]
                                         [ 1.0f; 0.0f; -1.0f ]], Point(0, 0))
 
-    use xEdges = filteredGreenFloat.Convolution(sobelKernel).Convert<Gray, float>()
-    use yEdges = filteredGreenFloat.Convolution(sobelKernel.Transpose()).Convert<Gray, float>()
+    use xEdges = filteredGreenWhitoutParasitesFloat.Convolution(sobelKernel).Convert<Gray, float>()
+    use yEdges = filteredGreenWhitoutParasitesFloat.Convolution(sobelKernel.Transpose()).Convert<Gray, float>()
 
     let xEdgesData = xEdges.Data
     let yEdgesData = yEdges.Data
@@ -70,18 +79,14 @@ let doAnalysis (img: Image<Bgr, byte>) (name: string) (config: Config) : Cell li
     logTime "Finding edges" (fun() -> thin edges)
     logTime "Removing small connected components from thinning" (fun () -> removeArea edges 12)
 
-    let kmediansResults = logTime "Finding foreground (k-medians)" (fun () -> KMedians.kmedians filteredGreenFloat 1.0)
-
-    let parasites = ParasitesMarker.find greenFloat filteredGreenFloat kmediansResults config
-
     let allEllipses, ellipses = logTime "Finding ellipses" (fun () ->
         let matchingEllipses = Ellipse.find edges xEdges yEdges config
         matchingEllipses.Ellipses, matchingEllipses.PrunedEllipses )
 
-    let cells = logTime "Classifier" (fun () -> Classifier.findCells ellipses parasites kmediansResults.fg config)
+    let cells = logTime "Classifier" (fun () -> Classifier.findCells ellipses parasites filteredGreenWhitoutParasites config)
 
     // Output pictures if debug flag is set.
-    match config.debug with
+    match config.Debug with
     | DebugOn output ->
         let dirPath = System.IO.Path.Combine(output, name)
         System.IO.Directory.CreateDirectory dirPath |> ignore
@@ -112,14 +117,23 @@ 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.preFilterSigma
+        let filteredGreenMaxima = gaussianFilter green config.Parameters.preFilterSigma
         for m in ImgTools.findMaxima filteredGreenMaxima do
             ImgTools.drawPoints filteredGreenMaxima m 255uy
         saveImg filteredGreenMaxima (buildFileName " - filtered - maxima.png")
 
         saveImg filteredGreen (buildFileName " - filtered.png")
-        saveImg blue (buildFileName " - blue.png")
+        saveImg filteredGreenWhitoutParasites (buildFileName " - filtered closed.png")
+
+        (*saveImg parasitesMarker (buildFileName " - parasites (area closing).png")
+        saveImg stainMarker (buildFileName " - stain (area closing).png")*)
+
         saveImg green (buildFileName " - green.png")
+
+        use blue  = scaledImg.Item(0)
+        saveImg blue (buildFileName " - blue.png")
+
+        use red = scaledImg.Item(2)
         saveImg red (buildFileName " - red.png")
     | _ -> ()