X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FProgram.fs;h=2aa3ee4f77c929454e2ef67ba1f0655d78d8545f;hb=4147bfad3c85dcf4fe7d291abf7d356379d88b4f;hp=f477cfe03bf9bc46ea9fc7ba189d0b321e2a13e8;hpb=6b550c3faf4dea77738fa5c27cd9af277f45549c;p=master-thesis.git

diff --git a/Parasitemia/Parasitemia/Program.fs b/Parasitemia/Parasitemia/Program.fs
index f477cfe..2aa3ee4 100644
--- a/Parasitemia/Parasitemia/Program.fs
+++ b/Parasitemia/Parasitemia/Program.fs
@@ -2,32 +2,13 @@
 
 open System
 open System.IO
-open System.Windows
-open System.Windows.Media
-open System.Windows.Markup
-open System.Windows.Shapes
-open System.Windows.Controls
-open System.Drawing
-open System.Diagnostics
 open System.Threading
 
-open FSharp.Collections.ParallelSeq
-
 open Emgu.CV
 open Emgu.CV.Structure
-open Emgu.CV.WPF
 
 open Config
 
-let display (window : Views.MainWindow) (img : IImage) =
-   let imgControl = window.Root.FindName("img") :?> Controls.Image
-   imgControl.Source <- BitmapSourceConvert.ToBitmapSource(img)
-
-let log (window : Views.MainWindow) (mess : string) =
-   let txtLog = window.Root.FindName("txtLog") :?> Controls.TextBlock
-   txtLog.Text <- txtLog.Text + mess + "\n"
-
-
 type Input =
     | File of string
     | Dir of string
@@ -57,33 +38,11 @@ let parseArgs (args: string[]) : Arguments =
 
 
 [<EntryPoint>]
+[<STAThread()>]
 let main args =
     match parseArgs args with
     | mode, debug ->
-        let config =
-            Config(
-              {
-                initialAreaOpen = 2000
-
-                minRbcRadius = -0.32f
-                maxRbcRadius = 0.32f
-
-                preFilterSigma = 1.7 // 1.5
-
-                factorNbPick = 1.0
-
-                darkStainLevel = 0.25 // Lower -> more sensitive. 0.3. Careful about illumination on the borders.
-                maxDarkStainRatio = 0.1 // 10 %
-
-                infectionArea = 0.012f // 1.2 %
-                infectionLevel = 1.12 // Lower -> more sensitive.
-
-                stainArea = 0.08f // 8 %
-                stainLevel = 1.1 // Lower -> more sensitive.
-                maxStainRatio = 0.12 // 12 %
-
-                standardDeviationMaxRatio = 0.5 // 0.55
-                minimumCellArea = 0.5f })
+        let config = Config(defaultParameters)
 
         match mode with
         | CmdLine (input, output) ->
@@ -104,18 +63,13 @@ let main args =
             use resultFile = new StreamWriter(new FileStream(Path.Combine(output, "results.txt"), FileMode.Append, FileAccess.Write))
 
             //try
-            let images = seq { 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), new Image<Bgr, byte>(file) ]
 
-            let nbConcurrentTaskLimit = 4
-            let n = Environment.ProcessorCount
 
             Utils.logTime "Whole analyze" (fun () ->
-                let results =
-                    images
-                    |> PSeq.map (fun (id, img) -> id, ImageAnalysis.doAnalysis img id (config.Copy()))
-                    |> PSeq.withDegreeOfParallelism (if n > nbConcurrentTaskLimit then nbConcurrentTaskLimit else n)
+                let results = ImageAnalysis.doMultipleAnalysis images config None
 
-                for id, cells in results do
+                for id, _, cells in results do
                     let total, infected = Utils.countCells cells
                     fprintf resultFile "File: %s %d %d %.2f\n" id total infected (100. * (float infected) / (float total)))
 
@@ -125,15 +79,13 @@ let main args =
             0
 
         | Window ->
-            let app = new Application()
-            let mainWindow = Views.MainWindow()
-
-            if debug
-            then
-                config.Debug <- DebugOn "."
+            (*let display (window : Views.MainWindow) (img : IImage) =
+               let imgControl = window.Root.FindName("img") :?> Controls.Image
+               imgControl.Source <- BitmapSourceConvert.ToBitmapSource(img)
 
-            Utils.log <- (fun m -> log mainWindow m)
+            let log (window : Views.MainWindow) (mess : string) =
+               let txtLog = window.Root.FindName("txtLog") :?> Controls.TextBlock
+               txtLog.Text <- txtLog.Text + mess + "\n"*)
 
-            //display mainWindow img
-            mainWindow.Root.Show()
-            app.Run()
+            if debug then config.Debug <- DebugOn "."
+            GUI.Main.run config