X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=Parasitemia%2FParasitemiaCore%2FAnalysis.fs;h=2a7ddc8389b53a3810110e65b4c5d001dfb59345;hb=9343c4deb0bf88c58d9c92d465d8e99f64656875;hp=e83977ab6fde91e83aafb695b002871cd394546d;hpb=85adb74195fe7145535d3d36263aec2f7879cd60;p=master-thesis.git

diff --git a/Parasitemia/ParasitemiaCore/Analysis.fs b/Parasitemia/ParasitemiaCore/Analysis.fs
index e83977a..2a7ddc8 100644
--- a/Parasitemia/ParasitemiaCore/Analysis.fs
+++ b/Parasitemia/ParasitemiaCore/Analysis.fs
@@ -103,7 +103,7 @@ let doAnalysis (img: Image<Bgr, byte>) (name: string) (config: Config) (reportPr
 
         let! prunedEllipses = logTimeWithName "Ellipses pruning" (fun () -> reportWithVal 80 (matchingEllipses.PrunedEllipses))
 
-        let! cells = logTimeWithName "Classifier" (fun () -> reportWithVal 100 (Classifier.findCells prunedEllipses parasites img_RBC_filtered config))
+        let! cells = logTimeWithName "Classifier" (fun () -> reportWithVal 100 (Classifier.findCells prunedEllipses parasites img.Width img.Height config))
 
         logWithName "Analysis finished"
 
@@ -138,10 +138,10 @@ let doAnalysis (img: Image<Bgr, byte>) (name: string) (config: Config) (reportPr
                 Drawing.drawCells imgCells' true cells
                 IO.saveImg imgCells' (buildFileName " - cells - full.png")
 
-                let filteredRBCMaxima = gaussianFilter img_RBC config.LPFStandardDeviationRBC
+                (* let filteredRBCMaxima = gaussianFilter img_RBC config.LPFStandardDeviationRBC
                 for m in findMaxima filteredRBCMaxima do
                     Drawing.drawPoints filteredRBCMaxima m 255.f
-                IO.saveImg filteredRBCMaxima (buildFileName " - filtered - maxima.png")
+                IO.saveImg filteredRBCMaxima (buildFileName " - filtered - maxima.png") *)
 
                 IO.saveImg imgWhitoutParasite (buildFileName " - filtered closed stain.png")
                 IO.saveImg imgWithoutNucleus (buildFileName " - filtered closed infection.png")
@@ -149,9 +149,9 @@ let doAnalysis (img: Image<Bgr, byte>) (name: string) (config: Config) (reportPr
                 IO.saveImg img_RBC_filtered (buildFileName " - source - RBC.png")
                 IO.saveImg img_parasites_filtered (buildFileName " - source - parasites.png")
 
-                IO.saveImg (normalize img_float.[2] 255.) (buildFileName " - source - red.png")
-                IO.saveImg (normalize img_float.[1] 255.) (buildFileName " - source - green.png")
-                IO.saveImg (normalize img_float.[0] 255.) (buildFileName " - source - blue.png")
+                IO.saveImg img_float.[2] (buildFileName " - source - red.png")
+                IO.saveImg img_float.[1] (buildFileName " - source - green.png")
+                IO.saveImg img_float.[0] (buildFileName " - source - blue.png")
             | _ -> ()
 
         return cells }