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

diff --git a/Parasitemia/Parasitemia/MainAnalysis.fs b/Parasitemia/Parasitemia/MainAnalysis.fs
index d959624..6f78b7c 100644
--- a/Parasitemia/Parasitemia/MainAnalysis.fs
+++ b/Parasitemia/Parasitemia/MainAnalysis.fs
@@ -32,22 +32,23 @@ let doAnalysis (img: Image<Bgr, byte>) (name: string) (config: Config) : Cell li
 
     logTime "areaOpen" (fun () -> ImgTools.areaOpen filteredGreen 2000)
 
-    config.RBCSize <- Granulometry.findRadius filteredGreen (10, 100) 0.5 |> float
+    config.RBCRadius <- 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>()
+    let parasites, filteredGreenWhitoutInfection, filteredGreenWhitoutStain = ParasitesMarker2.find filteredGreen filteredGreenFloat kmediansResults config
+    let filteredGreenWhitoutInfectionFloat = filteredGreenWhitoutInfection.Convert<Gray, float32>()
+    let filteredGreenWhitoutStainFloat = filteredGreenWhitoutStain.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 = filteredGreenWhitoutParasitesFloat.Convolution(sobelKernel).Convert<Gray, float>()
-    use yEdges = filteredGreenWhitoutParasitesFloat.Convolution(sobelKernel.Transpose()).Convert<Gray, float>()
+    use xEdges = filteredGreenWhitoutStainFloat.Convolution(sobelKernel).Convert<Gray, float>()
+    use yEdges = filteredGreenWhitoutStainFloat.Convolution(sobelKernel.Transpose()).Convert<Gray, float>()
 
     let xEdgesData = xEdges.Data
     let yEdgesData = yEdges.Data
@@ -83,7 +84,7 @@ let doAnalysis (img: Image<Bgr, byte>) (name: string) (config: Config) : Cell li
         let matchingEllipses = Ellipse.find edges xEdges yEdges config
         matchingEllipses.Ellipses, matchingEllipses.PrunedEllipses )
 
-    let cells = logTime "Classifier" (fun () -> Classifier.findCells ellipses parasites filteredGreenWhitoutParasites config)
+    let cells = logTime "Classifier" (fun () -> Classifier.findCells ellipses parasites filteredGreenWhitoutStain config)
 
     // Output pictures if debug flag is set.
     match config.Debug with
@@ -123,7 +124,7 @@ let doAnalysis (img: Image<Bgr, byte>) (name: string) (config: Config) : Cell li
         saveImg filteredGreenMaxima (buildFileName " - filtered - maxima.png")
 
         saveImg filteredGreen (buildFileName " - filtered.png")
-        saveImg filteredGreenWhitoutParasites (buildFileName " - filtered closed.png")
+        saveImg filteredGreenWhitoutStain (buildFileName " - filtered closed.png")
 
         (*saveImg parasitesMarker (buildFileName " - parasites (area closing).png")
         saveImg stainMarker (buildFileName " - stain (area closing).png")*)