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

diff --git a/Parasitemia/ParasitemiaUI/Program.fs b/Parasitemia/ParasitemiaUI/Program.fs
index 4cc4840..0f6df12 100644
--- a/Parasitemia/ParasitemiaUI/Program.fs
+++ b/Parasitemia/ParasitemiaUI/Program.fs
@@ -67,7 +67,7 @@ let main args =
         0
     else
         try
-            Log.User("Starting of Parasitemia UI ...")
+            Log.Info "Starting of Parasitemia UI ..."
 
             let result =
                 match parseArgs args with
@@ -82,10 +82,10 @@ 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 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 : %O %s ===" 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 ]
@@ -95,7 +95,7 @@ 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
@@ -105,7 +105,7 @@ let main args =
                                     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
@@ -114,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