X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemiaUI%2FProgram.fs;h=b3ca81d50193cd578ccd9accfd2c064414d1b8f6;hp=0f6df128050d7b31be0ea5d03e0e77a7e5de2936;hb=8cf2153bd18919de41745534d3dbf134f085e13c;hpb=e8d14548fc5b127970fccb19bad146512f7ac6d9

diff --git a/Parasitemia/ParasitemiaUI/Program.fs b/Parasitemia/ParasitemiaUI/Program.fs
index 0f6df12..b3ca81d 100644
--- a/Parasitemia/ParasitemiaUI/Program.fs
+++ b/Parasitemia/ParasitemiaUI/Program.fs
@@ -20,7 +20,7 @@ type RunningMode =
     | 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
+type Arguments = RunningMode * bool // bool : true if in debug mode.
 
 let parseArgs (args : string[]) : Arguments =
 
@@ -35,32 +35,21 @@ 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 (if args.Length > 0 && not (args.[0].StartsWith("--")) then Some args.[0] else None)
+                Window (if args.Length > 0 && not (args.[0].StartsWith ("--")) then Some args.[0] else None)
 
     runningMode, Array.exists ((=) "--debug") args
 
 let showArgsHelp () =
-    printfn "Usage of Parasitemia :"
-    printfn "Non-interactive mode:"
-    printfn "  %s (--folder <folder>|--file <file>) --output <folder> [--debug]" System.AppDomain.CurrentDomain.FriendlyName
-    printfn "    --folder <folder> : an input folder containing images to analyze"
-    printfn "    --file <file> : an image file to be analyzed"
-    printfn "    --output <folder> : a folder to put the results"
-    printfn "    --debug : output more information like intermediate images if set"
-
-    printfn "Interactive mode:"
-    printfn "  %s [<document-file>] [--debug]" System.AppDomain.CurrentDomain.FriendlyName
-    printfn "    <document-file> : a PIAZ file to automatically open at startup"
-    printfn "    --debug : output information like intermediate images if set in the current directory"
-
-[<System.Runtime.InteropServices.DllImport("kernel32.dll")>]
-extern bool AttachConsole(int dwProcessId)
+    Console.WriteLine Utils.argsHelp
+
+[<System.Runtime.InteropServices.DllImport "kernel32.dll">]
+extern bool AttachConsole (int dwProcessId)
 
 [<EntryPoint>]
-[<STAThread()>]
+[<STAThread ()>]
 let main args =
     // To redirect stdout to the attached console.
-    AttachConsole(-1) |> ignore // -1 to attach to the parent process.
+    AttachConsole -1 |> ignore // -1 to attach to the parent process.
 
     if Array.exists (fun e -> e = "--help" || e = "-h") args then
         showArgsHelp ()
@@ -72,7 +61,7 @@ let main args =
             let result =
                 match parseArgs args with
                 | mode, debug ->
-                    let config = Config(defaultParameters)
+                    let config = Config defaultParameters
 
                     match mode with
                     | CmdLine (input, output) ->
@@ -81,9 +70,9 @@ let main args =
 
                         Directory.CreateDirectory output |> ignore
 
-                        use logFile = new StreamWriter(new FileStream(Path.Combine(output, "log.txt"), FileMode.Append, FileAccess.Write))
-                        let listener = { new IListener with member this.NewEntry severity header mess = logFile.WriteLine(header + " : " + mess) }
-                        Log.AddListener(listener)
+                        use logFile = new StreamWriter (new FileStream (Path.Combine(output, "log.txt"), FileMode.Append, FileAccess.Write))
+                        let listener = { new IListener with member this.NewEntry severity header mess = logFile.WriteLine (header + " : " + mess) }
+                        Log.AddListener listener
 
                         Log.Info "=== New run : %O %s ===" DateTime.Now  (if debug then "[DEBUG]" else "[RELEASE]")
 
@@ -91,23 +80,25 @@ let main args =
                                     | File file -> [ file ]
                                     | Dir dir -> Directory.EnumerateFiles dir |> List.ofSeq
 
-                        use resultFile = new StreamWriter(new FileStream(Path.Combine(output, "results.txt"), FileMode.Append, FileAccess.Write))
-
-                        let images = [ for file in files -> Path.GetFileNameWithoutExtension(FileInfo(file).Name), config.Copy(), new Image<Bgr, byte>(file) ]
-
-                        Log.LogWithTime Severity.INFO (fun () ->
-                            match ParasitemiaCore.Analysis.doMultipleAnalysis images None with
-                            | Some results ->
-                                for id, cells in results do
-                                    let config, img = images |> List.pick (fun (id', config', img') -> if id' = id then Some (config', img') else None)
-                                    img.Dispose()
-                                    let total, infected = countCells cells
-                                    fprintf resultFile "File: %s %d %d %.2f (diameter: %O)\n" id total infected (100. * (float infected) / (float total)) config.RBCRadius
-                            | None ->
-                                fprintf resultFile "Analysis aborted"
-                            Some ()) "Whole analyze" |> ignore
-
-                        Log.RmListener(listener)
+                        use resultFile = new StreamWriter (new FileStream (Path.Combine (output, "results.txt"), FileMode.Append, FileAccess.Write))
+
+                        let images = [ for file in files -> Path.GetFileNameWithoutExtension (FileInfo(file).Name), config.Copy (), new Image<Bgr, byte> (file) ]
+
+                        Log.LogWithTime Types.Severity.INFO (
+                            fun () ->
+                                match ParasitemiaCore.Analysis.doMultipleAnalysis images None with
+                                | Some results ->
+                                    for id, result in results do
+                                        let config, img = images |> List.pick (fun (id', config', img') -> if id' = id then Some (config', img') else None)
+                                        img.Dispose ()
+                                        let total, infected = countCells result.Cells
+                                        fprintf resultFile "File: %s %d %d %.2f (diameter: %O)\n" id total infected (100. * (float infected) / (float total)) config.RBCRadius
+                                | None ->
+                                    fprintf resultFile "Analysis aborted"
+                                Some ()
+                        ) "Whole analyze" |> ignore
+
+                        Log.RemoveListener listener
                         0
 
                     | Window fileToOpen ->