X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FMainAnalysis.fs;h=c9e94224c67e957a14d3c3503732990188ba9d02;hp=3a38c4e95ab41e38f1bc919c010381da0424264e;hb=5b68d946369f998865d2dd330fd3b374b2b9a0ad;hpb=e76da913cd58078ad2479357b2430ed62a6e0777 diff --git a/Parasitemia/Parasitemia/MainAnalysis.fs b/Parasitemia/Parasitemia/MainAnalysis.fs index 3a38c4e..c9e9422 100644 --- a/Parasitemia/Parasitemia/MainAnalysis.fs +++ b/Parasitemia/Parasitemia/MainAnalysis.fs @@ -59,6 +59,7 @@ let doAnalysis (img: Image) (name: string) (config: Config) : Cell li logTime "Finding edges" (fun() -> thin edges) logTime "Removing small connected components from thinning" (fun () -> removeArea edges 12) + (* let kmediansResults = KMedians.kmedians filteredGreen 1.0 let parasites = ParasitesMarker.find green filteredGreen kmediansResults config @@ -70,12 +71,16 @@ let doAnalysis (img: Image) (name: string) (config: Config) : Cell li Ellipse.find edges xEdges yEdges radiusRange windowSize factorNbPick) let cells = logTime "Classifier" (fun () -> Classifier.findCells ellipses parasites kmediansResults.fg config) + *) + let cells = [] + // Output pictures if debug flag is set. match config.debug with | DebugOn output -> let buildFileName postfix = System.IO.Path.Combine(output, name + postfix) saveMat (edges * 255.0) (buildFileName " - edges.png") - saveImg parasites.darkStain (buildFileName " - parasites - dark stain.png") + + (*saveImg parasites.darkStain (buildFileName " - parasites - dark stain.png") saveImg parasites.stain (buildFileName " - parasites - stain.png") saveImg parasites.infection (buildFileName " - parasites - infection.png") @@ -91,7 +96,7 @@ let doAnalysis (img: Image) (name: string) (config: Config) : Cell li let imgCells' = img.Copy() drawCells imgCells' true cells - saveImg imgCells' (buildFileName " - cells - full.png") + saveImg imgCells' (buildFileName " - cells - full.png")*) | _ -> () cells