projects
/
master-thesis.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Add an exact method to compute an ellipse from three points and two tangents.
[master-thesis.git]
/
Parasitemia
/
Parasitemia
/
Program.fs
diff --git
a/Parasitemia/Parasitemia/Program.fs
b/Parasitemia/Parasitemia/Program.fs
index
2aa3ee4
..
06059f6
100644
(file)
--- a/
Parasitemia/Parasitemia/Program.fs
+++ b/
Parasitemia/Parasitemia/Program.fs
@@
-14,8
+14,8
@@
type Input =
| Dir of string
type RunningMode =
| 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
type Arguments = RunningMode * bool
@@
-32,14
+32,16
@@
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])
|_ ->
| 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
runningMode, Array.exists ((=) "--debug") args
-
[<EntryPoint>]
[<STAThread()>]
let main args =
[<EntryPoint>]
[<STAThread()>]
let main args =
+
+ let e = Ellipse.ellipse2 -11.4 -7.8 -0.169811 -23.75 0.8 -3.885714 -19. 1.5
+
match parseArgs args with
| mode, debug ->
let config = Config(defaultParameters)
match parseArgs args with
| mode, debug ->
let config = Config(defaultParameters)
@@
-63,22
+65,23
@@
let main args =
use resultFile = new StreamWriter(new FileStream(Path.Combine(output, "results.txt"), FileMode.Append, FileAccess.Write))
//try
use resultFile = new StreamWriter(new FileStream(Path.Combine(output, "results.txt"), FileMode.Append, FileAccess.Write))
//try
- let images = [ for file in files -> Path.GetFileNameWithoutExtension(FileInfo(file).Name), new Image<Bgr, byte>(file) ]
+ let images = [ for file in files -> Path.GetFileNameWithoutExtension(FileInfo(file).Name),
config.Copy(),
new Image<Bgr, byte>(file) ]
Utils.logTime "Whole analyze" (fun () ->
Utils.logTime "Whole analyze" (fun () ->
- let results = ImageAnalysis.doMultipleAnalysis images
config
None
+ let results = ImageAnalysis.doMultipleAnalysis images None
- for id, _, cells in results do
+ 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
let total, infected = Utils.countCells cells
- fprintf resultFile "File: %s %d %d %.2f
\n" id total infected (100. * (float infected) / (float total))
)
+ fprintf resultFile "File: %s %d %d %.2f
(diameter: %A)\n" id total infected (100. * (float infected) / (float total)) config.RBCRadius
)
//Utils.log (sprintf "== File: %A" file)
//with
//| :? IOException as ex -> Utils.log (sprintf "Unable to open the image '%A': %A" file ex)
0
//Utils.log (sprintf "== File: %A" file)
//with
//| :? IOException as ex -> Utils.log (sprintf "Unable to open the image '%A': %A" file ex)
0
- | Window ->
+ | Window
fileToOpen
->
(*let display (window : Views.MainWindow) (img : IImage) =
let imgControl = window.Root.FindName("img") :?> Controls.Image
imgControl.Source <- BitmapSourceConvert.ToBitmapSource(img)
(*let display (window : Views.MainWindow) (img : IImage) =
let imgControl = window.Root.FindName("img") :?> Controls.Image
imgControl.Source <- BitmapSourceConvert.ToBitmapSource(img)
@@
-88,4
+91,4
@@
let main args =
txtLog.Text <- txtLog.Text + mess + "\n"*)
if debug then config.Debug <- DebugOn "."
txtLog.Text <- txtLog.Text + mess + "\n"*)
if debug then config.Debug <- DebugOn "."
- GUI.Main.run config
+ GUI.Main.run config
fileToOpen