X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemiaUI%2FProgram.fs;h=b3ca81d50193cd578ccd9accfd2c064414d1b8f6;hp=a26abfc3a84a6611dc6afc0d451d39e67460bd03;hb=8cf2153bd18919de41745534d3dbf134f085e13c;hpb=154264f33619b78e17182082b483cba97e128698 diff --git a/Parasitemia/ParasitemiaUI/Program.fs b/Parasitemia/ParasitemiaUI/Program.fs index a26abfc..b3ca81d 100644 --- a/Parasitemia/ParasitemiaUI/Program.fs +++ b/Parasitemia/ParasitemiaUI/Program.fs @@ -20,9 +20,9 @@ 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 = +let parseArgs (args : string[]) : Arguments = let output = Array.tryFindIndex ((=) "--output") args @@ -35,91 +35,80 @@ 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 |--file ) --output [--debug]" System.AppDomain.CurrentDomain.FriendlyName - printfn " --folder : an input folder containing images to analyze" - printfn " --file : an image file to be analyzed" - printfn " --output : a folder to put the results" - printfn " --debug: output more information like intermediate images if set" - - printfn "Interactive mode:" - printfn " %s [] [--debug]" System.AppDomain.CurrentDomain.FriendlyName - printfn " : a PIAZ file to automatically open at startup" - printfn " --debug : output information like intermediate images if set in the current directory" - -[] -extern bool AttachConsole(int dwProcessId) + Console.WriteLine Utils.argsHelp + +[] +extern bool AttachConsole (int dwProcessId) [] -[] +[] 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 + 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 | mode, debug -> - let config = Config(defaultParameters) + let config = Config defaultParameters 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) } - 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.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 ] | 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(file) ] - - Log.LogWithTime("Whole analyze", Severity.USER, (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 - | None -> - fprintf resultFile "Analysis aborted" - Some ())) |> 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 (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 -> 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