X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemiaCore%2FMainAnalysis.fs;h=926aeac5523dcf734cab8660809337e8eb8a6b32;hp=be72a2b34a05e08542f31a1e40fa911e4960b076;hb=e588f9c954a54cb259b2c1f6f9e8d9dbd4639269;hpb=6c70577f0bcc17881c753f7a527d2ff4672bb6aa
diff --git a/Parasitemia/ParasitemiaCore/MainAnalysis.fs b/Parasitemia/ParasitemiaCore/MainAnalysis.fs
index be72a2b..926aeac 100644
--- a/Parasitemia/ParasitemiaCore/MainAnalysis.fs
+++ b/Parasitemia/ParasitemiaCore/MainAnalysis.fs
@@ -12,12 +12,25 @@ open Emgu.CV.Structure
open Logger
open Utils
+open Morpho
open ImgTools
open Config
open Types
+///
+/// Analyze the given image and detect reb blood cell (RBC) in it.
+///
+/// The image
+/// The name, used during logging
+/// The configuration, must not be shared with another analysis
+/// An optional function to report progress and/or cancel the process.
+/// The first call returning 'false' will cancel the analysis.
+/// The 'int' parameter correspond to the progression from 0 to 100
+/// A list of detected cells or nothing if the process has been cancelled
let doAnalysis (img: Image) (name: string) (config: Config) (reportProgress: (int -> bool) option) : Cell list option =
+
// To report the progress of this function from 0 to 100.
+ // Return 'None' if the process must be aborted.
let reportWithVal (percent: int) (value: 'a) : 'a option =
match reportProgress with
| Some f ->
@@ -29,7 +42,7 @@ let doAnalysis (img: Image) (name: string) (config: Config) (reportPr
let report (percent: int) : unit option =
reportWithVal percent ()
- let inline buildLogWithName (text: string) = sprintf "(%s) %s" name text
+ let inline buildLogWithName (text: string) = sprintf "(%s) %s" name text
let logWithName mess = Log.User(buildLogWithName mess)
let inline logTimeWithName (text: string) (f: unit -> 'a option) : 'a option = Log.LogWithTime((buildLogWithName text), Severity.USER, f)
@@ -38,25 +51,26 @@ let doAnalysis (img: Image) (name: string) (config: Config) (reportPr
logWithName "Starting analysis ..."
- use green = img.Item(1)
- let greenFloat = green.Convert()
- let filteredGreen = gaussianFilter greenFloat config.LPFStandardDeviation
+ use img_float = img.Convert()
- logWithName (sprintf "Nominal erytrocyte diameter: %A" config.RBCRadiusByResolution)
+ use img_RBC = img_float.[1] // mergeChannelsWithProjection img_float config.Parameters.averageColor_RBC config.Parameters.averageColor_BG 255.
+ use img_RBC_filtered = gaussianFilter img_RBC config.LPFStandardDeviationRBC
- let initialAreaOpening = int <| config.RBCRadiusByResolution.Area * config.Parameters.ratioAreaPaleCenter * 1.2f // We do an area opening a little larger to avoid to do a second one in the case the radius found is near the initial one.
- do! logTimeWithName "First area opening" (fun () -> ImgTools.areaOpenF filteredGreen initialAreaOpening; report 10)
+ use img_parasites = img_float.[2] // mergeChannelsWithProjection img_float config.Parameters.averageColor_Parasite config.Parameters.averageColor_RBC 255.
+ use img_parasites_filtered = gaussianFilter img_parasites config.LPFStandardDeviationParasite
- //do! report 10
+ logWithName (sprintf "Nominal erythrocyte diameter: %A" config.RBCRadiusByResolution)
+
+ let initialAreaOpening = int <| config.RBCRadiusByResolution.Area * config.Parameters.ratioAreaPaleCenter * 1.1f // We do an area opening a little larger to avoid to do a second one in the case the radius found is near the initial one.
+ do! logTimeWithName "First area opening" (fun () -> areaOpenF img_RBC_filtered initialAreaOpening; report 10)
let range =
let delta = config.Parameters.granulometryRange * config.RBCRadiusByResolution.Pixel
int <| config.RBCRadiusByResolution.Pixel - delta, int <| config.RBCRadiusByResolution.Pixel + delta
- //let r1 = log "Granulometry (morpho)" (fun() -> Granulometry.findRadiusByClosing (filteredGreen.Convert()) range 1.0 |> float32)
- let! radius = logTimeWithName "Granulometry (area)" (fun() -> reportWithVal 10 (Granulometry.findRadiusByAreaClosing filteredGreen range |> float32))
+ let! radius = logTimeWithName "Granulometry (area)" (fun() -> reportWithVal 10 (Granulometry.findRadiusByAreaClosing img_RBC_filtered range |> float32))
config.SetRBCRadius <| radius
- logWithName (sprintf "Found erytrocyte diameter: %A" config.RBCRadius)
+ logWithName (sprintf "Found erythrocyte diameter: %A" config.RBCRadius)
do! report 20
@@ -64,23 +78,26 @@ let doAnalysis (img: Image) (name: string) (config: Config) (reportPr
let secondAreaOpening = int <| config.RBCRadius.Area * config.Parameters.ratioAreaPaleCenter
if secondAreaOpening > initialAreaOpening
then
- logTimeWithName "Second area opening" (fun () -> ImgTools.areaOpenF filteredGreen secondAreaOpening; report 30)
+ logTimeWithName "Second area opening" (fun () -> areaOpenF img_RBC_filtered secondAreaOpening; report 30)
else
report 30
- let parasites, filteredGreenWhitoutStain = ParasitesMarker.find filteredGreen config
- //let parasites, filteredGreenWhitoutInfection, filteredGreenWhitoutStain = ParasitesMarker.findMa greenFloat filteredGreenFloat config
+ // Removing parasites.
+ areaCloseF img_RBC_filtered (roundInt <| Const.PI * config.RBCRadius.ParasiteRadius ** 2.f)
+
+ let! parasites, imgWhitoutParasite, imgWithoutNucleus =
+ logTimeWithName "Parasites segmentation" (fun () -> reportWithVal 40 (ParasitesMarker.find img_parasites_filtered config))
let! edges, xGradient, yGradient = logTimeWithName "Finding edges" (fun () ->
- let edges, xGradient, yGradient = ImgTools.findEdges filteredGreenWhitoutStain
+ let edges, xGradient, yGradient = Edges.find img_RBC_filtered
removeArea edges (config.RBCRadius.Pixel ** 2.f / 50.f |> int)
- reportWithVal 40 (edges, xGradient, yGradient))
+ reportWithVal 50 (edges, xGradient, yGradient))
let! matchingEllipses = logTimeWithName "Finding ellipses" (fun () -> reportWithVal 60 (Ellipse.find edges xGradient yGradient config))
let! prunedEllipses = logTimeWithName "Ellipses pruning" (fun () -> reportWithVal 80 (matchingEllipses.PrunedEllipses))
- let! cells = logTimeWithName "Classifier" (fun () -> reportWithVal 100 (Classifier.findCells prunedEllipses parasites filteredGreenWhitoutStain config))
+ let! cells = logTimeWithName "Classifier" (fun () -> reportWithVal 100 (Classifier.findCells prunedEllipses parasites img_RBC_filtered config))
logWithName "Analysis finished"
@@ -93,44 +110,43 @@ let doAnalysis (img: Image) (name: string) (config: Config) (reportPr
let buildFileName postfix = System.IO.Path.Combine(dirPath, name + postfix)
- saveMat (edges * 255.0) (buildFileName " - edges.png")
+ IO.saveMat (edges * 255.0) (buildFileName " - edges.png")
- saveImg parasites.darkStain (buildFileName " - parasites - dark stain.png")
- saveImg parasites.stain (buildFileName " - parasites - stain.png")
- saveImg parasites.infection (buildFileName " - parasites - infection.png")
+ IO.saveImg parasites.darkStain (buildFileName " - parasites - dark stain.png")
+ IO.saveImg parasites.parasite (buildFileName " - parasites - stain.png")
+ IO.saveImg parasites.nucleus (buildFileName " - parasites - infection.png")
let imgAllEllipses = img.Copy()
- drawEllipses imgAllEllipses matchingEllipses.Ellipses (Bgr(255.0, 255.0, 255.0)) 0.04
- saveImg imgAllEllipses (buildFileName " - ellipses - all.png")
+ Drawing.drawEllipses imgAllEllipses matchingEllipses.Ellipses (Bgr(255.0, 255.0, 255.0)) 0.04
+ IO.saveImg imgAllEllipses (buildFileName " - ellipses - all.png")
- let imgEllipses = filteredGreenWhitoutStain.Convert()
- drawEllipses imgEllipses prunedEllipses (Bgr(0.0, 240.0, 240.0)) 1.0
- saveImg imgEllipses (buildFileName " - ellipses.png")
+ let imgEllipses = img_RBC_filtered.Convert()
+ Drawing.drawEllipses imgEllipses prunedEllipses (Bgr(0.0, 240.0, 240.0)) 1.0
+ IO.saveImg imgEllipses (buildFileName " - ellipses.png")
let imgCells = img.Copy()
- drawCells imgCells false cells
- saveImg imgCells (buildFileName " - cells.png")
+ Drawing.drawCells imgCells false cells
+ IO.saveImg imgCells (buildFileName " - cells.png")
let imgCells' = img.Copy()
- drawCells imgCells' true cells
- saveImg imgCells' (buildFileName " - cells - full.png")
-
- let filteredGreenMaxima = gaussianFilter greenFloat config.LPFStandardDeviation
- for m in ImgTools.findMaxima filteredGreenMaxima do
- ImgTools.drawPoints filteredGreenMaxima m 255.f
- saveImg filteredGreenMaxima (buildFileName " - filtered - maxima.png")
+ Drawing.drawCells imgCells' true cells
+ IO.saveImg imgCells' (buildFileName " - cells - full.png")
- saveImg filteredGreen (buildFileName " - filtered.png")
- saveImg filteredGreenWhitoutStain (buildFileName " - filtered closed stain.png")
- //saveImg filteredGreenWhitoutInfection (buildFileName " - filtered closed infection.png")
+ let filteredGreenMaxima = gaussianFilter img_RBC config.LPFStandardDeviationRBC
+ for m in findMaxima filteredGreenMaxima do
+ Drawing.drawPoints filteredGreenMaxima m 255.f
+ IO.saveImg filteredGreenMaxima (buildFileName " - filtered - maxima.png")
- saveImg green (buildFileName " - green.png")
+ IO.saveImg img_RBC_filtered (buildFileName " - filtered.png")
+ IO.saveImg imgWhitoutParasite (buildFileName " - filtered closed stain.png")
+ IO.saveImg imgWithoutNucleus (buildFileName " - filtered closed infection.png")
- use blue = img.Item(0)
- saveImg blue (buildFileName " - blue.png")
+ IO.saveImg img_RBC (buildFileName " - source - RBC.png")
+ IO.saveImg img_parasites (buildFileName " - source - parasites.png")
- use red = img.Item(2)
- saveImg red (buildFileName " - red.png")
+ IO.saveImg (normalize img_float.[2] 255.) (buildFileName " - source - red.png")
+ IO.saveImg (normalize img_float.[1] 255.) (buildFileName " - source - green.png")
+ IO.saveImg (normalize img_float.[0] 255.) (buildFileName " - source - blue.png")
| _ -> ()
return cells }
@@ -138,8 +154,11 @@ let doAnalysis (img: Image) (name: string) (config: Config) (reportPr
///
/// Do multiple analyses on the same time. The number of concurrent process depends if the number of the core.
///
-///
-/// An optional function to report progress. The process is aborted if the returned value is false
+/// The images: (name * configuration * image)
+/// An optional function to report progress and/or cancel the process.
+/// The first call returning 'false' will cancel the analysis.
+/// The 'int' parameter correspond to the progression from 0 to 100
+/// 'None' if the process has been cancelled or the list of result as (name * cells), 'name' corresponds to the given name
let doMultipleAnalysis (imgs: (string * Config * Image) list) (reportProgress: (int -> bool) option) : (string * Cell list) list option =
let report (percent: int) : bool =
match reportProgress with