X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FProgram.fs;h=b44c65f0855e47537579219803863d07bd78d72e;hb=d9a6e072ecf299db691c05bb559a71265f812ba3;hp=56672bd0646bda268189cde7006f6c29e9b02e92;hpb=ba64921fb9a0c36cd8cf802cbf1b2c0f79bc25f6;p=master-thesis.git

diff --git a/Parasitemia/Parasitemia/Program.fs b/Parasitemia/Parasitemia/Program.fs
index 56672bd..b44c65f 100644
--- a/Parasitemia/Parasitemia/Program.fs
+++ b/Parasitemia/Parasitemia/Program.fs
@@ -33,20 +33,40 @@ do
     Utils.log <- (fun m -> log mainWindow m)
 
     let config = {
+        scale = 1.0
+
         doGSigma1 = 1.5
         doGSigma2 = 20.0
         doGLowFreqPercentageReduction = 0.9
-        scale = 1.0
-    }
+
+        darkStainLevel = 0.839     
+        
+        stainSigma = 10.0
+        stainLevel = 0.9
+        stainSpreadRequired = 3.0
+    
+        infectionSigma = 2.0
+        infectionLevel = 0.762
+        infectionPixelsRequired = 1 }
    
-    //use img = new Image<Rgb, byte>("../../../../src/Tests_hough/images/1508133543-7-4-120-0001.png")
+    ///// ELLIPSES /////
+    //use img = new Image<Bgr, byte>("../../../../src/Tests_hough/images/1508133543-7-4-120-0001.png")
     //use img = new Image<Bgr, byte>("../../../../src/Tests_hough/images/rbc_single.png")
-    //use img = new Image<Bgr, byte>("../../../../src/Tests_hough/images/rbc_single_oblong_2.png")
-    use img = new Image<Bgr, byte>("../../../../src/Tests_hough/images/two_rbc_1.png")
-   
-    let result = ImageAnalysis.doAnalysis img config
+    //use img = new Image<Bgr, byte>("../../../../src/Tests_hough/images/rbc_single_oblong_4.png")
+    //use img = new Image<Bgr, byte>("../../../../src/Tests_hough/images/strange_rbc_1.png")
+    //use img = new Image<Bgr, byte>("../../../../src/Tests_hough/images/rbc_single_blurred.png")   
+    use img = new Image<Bgr, byte>("../../../../src/Tests_hough/images/lot.png")
 
-    display mainWindow result.img
-    mainWindow.Root.Show()
 
+    ///// PARASITES /////
+    //use img = new Image<Bgr, byte>("../../../../src/Parasites/images/1.png")
+    
+//    KdTree.test3 ()
+//    Utils.dprintfn "area: %A" area
+
+    let result = Utils.logTime "Total" (fun () ->
+        ImageAnalysis.doAnalysis img config )
+    
+    display mainWindow img
+    mainWindow.Root.Show()
     app.Run() |> ignore