X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FProgram.fs;h=038f827c754aa3deb22f0c08dff0b43b69f17bb3;hp=5b8c3e405589b9802115df7cdae92f3c744938c9;hb=807437584bdd3d7b7b33be8282472f81f8cce606;hpb=21ce317bce2e1b58803bbb1be439161251478568

diff --git a/Parasitemia/Parasitemia/Program.fs b/Parasitemia/Parasitemia/Program.fs
index 5b8c3e4..038f827 100644
--- a/Parasitemia/Parasitemia/Program.fs
+++ b/Parasitemia/Parasitemia/Program.fs
@@ -2,29 +2,13 @@
 
 open System
 open System.IO
-open System.Windows
-open System.Windows.Media
-open System.Windows.Markup
-open System.Windows.Shapes
-open System.Windows.Controls
-open System.Drawing
-open System.Diagnostics
+open System.Threading
 
 open Emgu.CV
 open Emgu.CV.Structure
-open Emgu.CV.WPF
 
 open Config
 
-let display (window : Views.MainWindow) (img : IImage) =
-   let imgControl = window.Root.FindName("img") :?> Controls.Image
-   imgControl.Source <- BitmapSourceConvert.ToBitmapSource(img)
-
-let log (window : Views.MainWindow) (mess : string) =
-   let txtLog = window.Root.FindName("txtLog") :?> Controls.TextBlock
-   txtLog.Text <- txtLog.Text + mess + "\n"
-
-
 type Input =
     | File of string
     | Dir of string
@@ -54,34 +38,35 @@ let parseArgs (args: string[]) : Arguments =
 
 
 [<EntryPoint>]
+[<STAThread()>]
 let main args =
     match parseArgs args with
     | mode, debug ->
         let config =
             Config(
-              { scale = 1.
+              {
+                initialAreaOpen = 2000
+                ratioSecondAreaOpen = 1.f / 3.f
 
-                minRbcRadius = -0.35
-                maxRbcRadius = 0.35
+                minRbcRadius = -0.3f
+                maxRbcRadius = 0.3f
 
-                preFilterSigma = 1.5
+                preFilterSigma = 1.7 // 1.5
 
                 factorNbPick = 1.0
-                factorWindowSize = 2.0
 
-                darkStainLevel = 0.4 // Lower -> more sensitive.
+                darkStainLevel = 0.25 // 0.3
+                maxDarkStainRatio = 0.1 // 10 %
 
-                infectionArea = 0.015
-                infectionLevel = 0.2
-                parasitePixelsRequired = 1
+                infectionArea = 0.012f // 1.2 %
+                infectionLevel = 1.12 // Lower -> more sensitive.
 
-                stainArea = 0.06
-                stainLevel = 0.2
+                stainArea = 0.08f // 8 %
+                stainLevel = 1.1 // Lower -> more sensitive.
+                maxStainRatio = 0.12 // 12 %
 
-                maxDarkStainRatio = 0.1
-
-                standardDeviationMaxRatio = 0.65
-                minimumCellArea = 0.5 })
+                standardDeviationMaxRatio = 0.5 // 0.55
+                minimumCellAreaFactor = 0.5f })
 
         match mode with
         | CmdLine (input, output) ->
@@ -101,28 +86,30 @@ let main args =
 
             use resultFile = new StreamWriter(new FileStream(Path.Combine(output, "results.txt"), FileMode.Append, FileAccess.Write))
 
-            for file in files do
-                try
-                    use img = new Image<Bgr, byte>(file)
-                    Utils.log (sprintf "== File: %A" file)
+            //try
+            let images = [ for file in files -> Path.GetFileNameWithoutExtension(FileInfo(file).Name), new Image<Bgr, byte>(file) ]
+
 
-                    let cells = Utils.logTime "Whole analyze" (fun () -> ImageAnalysis.doAnalysis img (Path.GetFileNameWithoutExtension(FileInfo(file).Name)) config)
+            Utils.logTime "Whole analyze" (fun () ->
+                let results = ImageAnalysis.doMultipleAnalysis images config None
+
+                for id, _, cells in results do
                     let total, infected = Utils.countCells cells
-                    fprintf resultFile "File: %s %d %d %.2f\n" file total infected (100. * (float infected) / (float total))
-                with
-                | :? IOException as ex -> Utils.log (sprintf "Unable to open the image '%A': %A" file ex)
+                    fprintf resultFile "File: %s %d %d %.2f\n" id total infected (100. * (float infected) / (float total)))
+
+            //Utils.log (sprintf "== File: %A" file)
+            //with
+            //| :? IOException as ex -> Utils.log (sprintf "Unable to open the image '%A': %A" file ex)
             0
 
         | Window ->
-            let app = new Application()
-            let mainWindow = Views.MainWindow()
-
-            if debug
-            then
-                config.Debug <- DebugOn "."
+            (*let display (window : Views.MainWindow) (img : IImage) =
+               let imgControl = window.Root.FindName("img") :?> Controls.Image
+               imgControl.Source <- BitmapSourceConvert.ToBitmapSource(img)
 
-            Utils.log <- (fun m -> log mainWindow m)
+            let log (window : Views.MainWindow) (mess : string) =
+               let txtLog = window.Root.FindName("txtLog") :?> Controls.TextBlock
+               txtLog.Text <- txtLog.Text + mess + "\n"*)
 
-            //display mainWindow img
-            mainWindow.Root.Show()
-            app.Run()
+            if debug then config.Debug <- DebugOn "."
+            GUI.Main.run config