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

diff --git a/Parasitemia/Parasitemia/Program.fs b/Parasitemia/Parasitemia/Program.fs
index fd9a2f9..b44c65f 100644
--- a/Parasitemia/Parasitemia/Program.fs
+++ b/Parasitemia/Parasitemia/Program.fs
@@ -55,17 +55,18 @@ do
     //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")
+    use img = new Image<Bgr, byte>("../../../../src/Tests_hough/images/lot.png")
 
 
     ///// PARASITES /////
-    use img = new Image<Bgr, byte>("../../../../src/Parasites/images/1.png")
+    //use img = new Image<Bgr, byte>("../../../../src/Parasites/images/1.png")
     
 //    KdTree.test3 ()
 //    Utils.dprintfn "area: %A" area
 
-    let result = ImageAnalysis.doAnalysis img config
+    let result = Utils.logTime "Total" (fun () ->
+        ImageAnalysis.doAnalysis img config )
     
-    display mainWindow result.img
+    display mainWindow img
     mainWindow.Root.Show()
     app.Run() |> ignore