X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FProgram.fs;h=5b8c3e405589b9802115df7cdae92f3c744938c9;hb=21ce317bce2e1b58803bbb1be439161251478568;hp=fdbc9087b80f9ca15b2195f512a88fd57a454e68;hpb=b070295cf67b2025164a34b6594e84f0d771cdc9;p=master-thesis.git

diff --git a/Parasitemia/Parasitemia/Program.fs b/Parasitemia/Parasitemia/Program.fs
index fdbc908..5b8c3e4 100644
--- a/Parasitemia/Parasitemia/Program.fs
+++ b/Parasitemia/Parasitemia/Program.fs
@@ -57,43 +57,37 @@ let parseArgs (args: string[]) : Arguments =
 let main args =
     match parseArgs args with
     | mode, debug ->
-        let scale = 1.
-        let config = {
-            debug = if debug then DebugOn "." else DebugOff
+        let config =
+            Config(
+              { scale = 1.
 
-            scale = scale
+                minRbcRadius = -0.35
+                maxRbcRadius = 0.35
 
-            // RBC size range in px at scale = 1.0.
-            minRBCSize = 20.
-            maxRBCSize = 42.
+                preFilterSigma = 1.5
 
-            doGSigma1 = 1.5
-            doGSigma2 = 30.
-            doGLowFreqPercentageReduction = 0.75
+                factorNbPick = 1.0
+                factorWindowSize = 2.0
 
-            factorNbPick = 1.0
-            factorWindowSize = 2.0
+                darkStainLevel = 0.4 // Lower -> more sensitive.
 
-            darkStainLevel = 0.4 // Lower -> more sensitive.
+                infectionArea = 0.015
+                infectionLevel = 0.2
+                parasitePixelsRequired = 1
 
-            stainSigma = 10.
-            stainLevel = 0.9
-            stainSpreadRequired = 3.0
+                stainArea = 0.06
+                stainLevel = 0.2
 
-            infectionSigma = 2.2
-            infectionLevel = 0.85
-            infectionPixelsRequired = 1
+                maxDarkStainRatio = 0.1
 
-            percentageOfFgValidCell = 0.4
-
-            MaxDarkStainRatio = 0.1
-
-            minimumCellArea = 1000. * scale ** 2. |> int
-            maxOffcenter = 0.5 }
+                standardDeviationMaxRatio = 0.65
+                minimumCellArea = 0.5 })
 
         match mode with
         | CmdLine (input, output) ->
-            let config = if debug then { config with debug = DebugOn output } else config
+            if debug
+            then
+                config.Debug <- DebugOn output
 
             Directory.CreateDirectory output |> ignore
 
@@ -123,6 +117,10 @@ let main args =
             let app = new Application()
             let mainWindow = Views.MainWindow()
 
+            if debug
+            then
+                config.Debug <- DebugOn "."
+
             Utils.log <- (fun m -> log mainWindow m)
 
             //display mainWindow img