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

diff --git a/Parasitemia/ParasitemiaUI/Program.fs b/Parasitemia/ParasitemiaUI/Program.fs
index a26abfc..0f6df12 100644
--- a/Parasitemia/ParasitemiaUI/Program.fs
+++ b/Parasitemia/ParasitemiaUI/Program.fs
@@ -22,7 +22,7 @@ type RunningMode =
 
 type Arguments = RunningMode * bool
 
-let parseArgs (args: string[]) : Arguments =
+let parseArgs (args : string[]) : Arguments =
 
     let output = Array.tryFindIndex ((=) "--output") args
 
@@ -46,7 +46,7 @@ let showArgsHelp () =
     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 "    --debug : output more information like intermediate images if set"
 
     printfn "Interactive mode:"
     printfn "  %s [<document-file>] [--debug]" System.AppDomain.CurrentDomain.FriendlyName
@@ -62,13 +62,12 @@ let main args =
     // To redirect stdout to the attached console.
     AttachConsole(-1) |> ignore // -1 to attach to the parent process.
 
-    if Array.exists (fun e -> e = "--help" || e = "-h") args
-    then
+    if Array.exists (fun e -> e = "--help" || e = "-h") args then
         showArgsHelp ()
         0
     else
         try
-            Log.User("Starting of Parasitemia UI ...")
+            Log.Info "Starting of Parasitemia UI ..."
 
             let result =
                 match parseArgs args with
@@ -77,17 +76,16 @@ let main args =
 
                     match mode with
                     | CmdLine (input, output) ->
-                        if debug
-                        then
+                        if debug then
                             config.Debug <- DebugOn output
 
                         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 mess = logFile.WriteLine(mess) }
+                        let listener = { new IListener with member this.NewEntry severity header mess = logFile.WriteLine(header + " : " + mess) }
                         Log.AddListener(listener)
 
-                        Log.User (sprintf "=== New run : %A %A ===" DateTime.Now  (if debug then "[DEBUG]" else "[RELEASE]"))
+                        Log.Info "=== New run : %O %s ===" DateTime.Now  (if debug then "[DEBUG]" else "[RELEASE]")
 
                         let files = match input with
                                     | File file -> [ file ]
@@ -97,17 +95,17 @@ let main args =
 
                         let images = [ for file in files -> Path.GetFileNameWithoutExtension(FileInfo(file).Name), config.Copy(), new Image<Bgr, byte>(file) ]
 
-                        Log.LogWithTime("Whole analyze", Severity.USER, (fun () ->
+                        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: %A)\n" id total infected (100. * (float infected) / (float total)) config.RBCRadius
+                                    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 ())) |> ignore
+                            Some ()) "Whole analyze" |> ignore
 
                         Log.RmListener(listener)
                         0
@@ -116,10 +114,10 @@ let main args =
                         if debug then config.Debug <- DebugOn "."
                         GUI.run config fileToOpen
 
-            Log.User("Parasitemia UI closed")
+            Log.Info "Parasitemia UI closed"
             result
 
         with
         | ex ->
-            Log.Fatal("Error: {0}", ex)
+            Log.Fatal "Error: %A" ex
             1
\ No newline at end of file