X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FProgram.fs;h=06059f69a319f3d37e2c254d1a44a47b296faf51;hb=81d1b86719a1ebaf649c1de4c1364603155a53e1;hp=ac495b591819bcdb2ab086f441477cf59935d5ef;hpb=6d99ab0dadc57e91cd846844b620fc90b52a2f96;p=master-thesis.git

diff --git a/Parasitemia/Parasitemia/Program.fs b/Parasitemia/Parasitemia/Program.fs
index ac495b5..06059f6 100644
--- a/Parasitemia/Parasitemia/Program.fs
+++ b/Parasitemia/Parasitemia/Program.fs
@@ -2,36 +2,20 @@
 
 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
 
 type RunningMode =
-    | CmdLine of Input * string
-    | Window
+    | CmdLine of Input * string // A file or a directory to process and the output directory.
+    | Window of string option // An optional path to a file to open can be given in window mode.
 
 type Arguments = RunningMode * bool
 
@@ -48,39 +32,19 @@ let parseArgs (args: string[]) : Arguments =
             | Some i, Some i_output when i < args.Length - 2 && i_output < args.Length - 2 ->
                 CmdLine ((File args.[i+1]), args.[i_output + 1])
             |_ ->
-                Window
+                Window (if args.Length > 0 && not (args.[0].StartsWith("--")) then Some args.[0] else None)
 
     runningMode, Array.exists ((=) "--debug") args
 
-
 [<EntryPoint>]
+[<STAThread()>]
 let main args =
-    match parseArgs args with
-    | mode, debug ->
-        let config =
-            Config(
-              { scale = 1.
-
-                minRbcRadius = -0.3
-                maxRbcRadius = 0.3
-
-                preFilterSigma = 1.5
-
-                factorNbPick = 1.0
-                factorWindowSize = 2.0
-
-                darkStainLevel = 0.4 // Lower -> more sensitive.
 
-                infectionArea = 0.015
-                infectionLevel = 0.2
-                parasitePixelsRequired = 1
+    let e = Ellipse.ellipse2 -11.4 -7.8 -0.169811 -23.75 0.8 -3.885714 -19. 1.5
 
-                stainArea = 0.06
-                stainLevel = 0.2
-
-                maxDarkStainRatio = 0.1
-
-                minimumCellArea = 0.3 })
+    match parseArgs args with
+    | mode, debug ->
+        let config = Config(defaultParameters)
 
         match mode with
         | CmdLine (input, output) ->
@@ -100,28 +64,31 @@ 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), config.Copy(), 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 None
+
+                for id, cells in results do
+                    let config = images |> List.pick (fun (id', config', _) -> if id' = id then Some config' else None)
                     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)
-            0
+                    fprintf resultFile "File: %s %d %d %.2f (diameter: %A)\n" id total infected (100. * (float infected) / (float total)) config.RBCRadius)
 
-        | Window ->
-            let app = new Application()
-            let mainWindow = Views.MainWindow()
+            //Utils.log (sprintf "== File: %A" file)
+            //with
+            //| :? IOException as ex -> Utils.log (sprintf "Unable to open the image '%A': %A" file ex)
+            0
 
-            if debug
-            then
-                config.Debug <- DebugOn "."
+        | Window fileToOpen ->
+            (*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 fileToOpen