X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FMainAnalysis.fs;h=043eb739cd6dcaba1805a62f7e43f885f4373685;hb=3ddaf64dc5ba6a7066a279ad75b9a1ee72194639;hp=c9e94224c67e957a14d3c3503732990188ba9d02;hpb=5b68d946369f998865d2dd330fd3b374b2b9a0ad;p=master-thesis.git diff --git a/Parasitemia/Parasitemia/MainAnalysis.fs b/Parasitemia/Parasitemia/MainAnalysis.fs index c9e9422..043eb73 100644 --- a/Parasitemia/Parasitemia/MainAnalysis.fs +++ b/Parasitemia/Parasitemia/MainAnalysis.fs @@ -13,82 +13,56 @@ open Types let doAnalysis (img: Image) (name: string) (config: Config) : Cell list = + use green = img.Item(1) + let greenFloat = green.Convert() + let filteredGreen = gaussianFilter greenFloat (float config.Parameters.preFilterSigma) - let imgFloat = img.Convert() - use scaledImg = if config.scale = 1.0 then imgFloat else imgFloat.Resize(config.scale, CvEnum.Inter.Area) + logTime "areaOpen 1" (fun () -> ImgTools.areaOpenF filteredGreen config.Parameters.initialAreaOpen) - use green = scaledImg.Item(1) + let r1 = logTime "Granulometry (morpho)" (fun() -> Granulometry.findRadiusByClosing (filteredGreen.Convert()) (10, 80) 0.5 |> float32) + // let r2 = logTime "Granulometry (area)" (fun() -> Granulometry.findRadiusByAreaClosing filteredGreen (10, 80) |> float32) + // log (sprintf "r1: %A, r2: %A" r1 r2) + config.RBCRadius <- r1 - use filteredGreen = (gaussianFilter green config.doGSigma1) - config.doGLowFreqPercentageReduction * (gaussianFilter green config.doGSigma2) + let secondAreaOpen = int <| config.RBCArea / 3.f - use sobelKernel = - new ConvolutionKernelF(array2D [[ 1.0f; 0.0f; -1.0f ] - [ 2.0f; 0.0f; -2.0f ] - [ 1.0f; 0.0f; -1.0f ]], Point(0, 0)) + if secondAreaOpen > config.Parameters.initialAreaOpen + then + logTime "areaOpen 2" (fun () -> ImgTools.areaOpenF filteredGreen secondAreaOpen) - use xEdges = filteredGreen.Convolution(sobelKernel).Convert() - use yEdges = filteredGreen.Convolution(sobelKernel.Transpose()).Convert() + let parasites, filteredGreenWhitoutStain = ParasitesMarker.find filteredGreen config + //let parasites, filteredGreenWhitoutInfection, filteredGreenWhitoutStain = ParasitesMarker.findMa greenFloat filteredGreenFloat config - let xEdgesData = xEdges.Data - let yEdgesData = yEdges.Data - for r in 0..xEdges.Rows-1 do - xEdgesData.[r, 0, 0] <- 0.0 - xEdgesData.[r, xEdges.Cols-1, 0] <- 0.0 - yEdgesData.[r, 0, 0] <- 0.0 - yEdgesData.[r, xEdges.Cols-1, 0] <- 0.0 + let edges, xGradient, yGradient = logTime "Finding edges" (fun () -> ImgTools.findEdges filteredGreenWhitoutStain) + logTime "Removing small connected components from thinning" (fun () -> removeArea edges (config.RBCRadius ** 2.f / 50.f |> int)) - for c in 0..xEdges.Cols-1 do - xEdgesData.[0, c, 0] <- 0.0 - xEdgesData.[xEdges.Rows-1, c, 0] <- 0.0 - yEdgesData.[0, c, 0] <- 0.0 - yEdgesData.[xEdges.Rows-1, c, 0] <- 0.0 + let allEllipses, ellipses = logTime "Finding ellipses" (fun () -> + let matchingEllipses = Ellipse.find edges xGradient yGradient config + matchingEllipses.Ellipses, matchingEllipses.PrunedEllipses) - use magnitudes = new Matrix(xEdges.Size) - CvInvoke.CartToPolar(xEdges, yEdges, magnitudes, new Mat()) // Compute the magnitudes (without angles). - - let min = ref 0.0 - let minLocation = ref <| Point() - let max = ref 0.0 - let maxLocation = ref <| Point() - magnitudes.MinMax(min, max, minLocation, maxLocation) - - use magnitudesByte = ((magnitudes / !max) * 255.0).Convert() // Otsu from OpenCV only support 'byte'. - use edges = new Matrix(xEdges.Size) - CvInvoke.Threshold(magnitudesByte, edges, 0.0, 1.0, CvEnum.ThresholdType.Otsu ||| CvEnum.ThresholdType.Binary) |> ignore - - 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 - - let radiusRange = config.scale * config.minRBCSize, config.scale * config.maxRBCSize - let windowSize = roundInt (1.6 * (snd radiusRange)) - let factorNbPick = 1.5 - let ellipses = logTime "Finding ellipses" (fun () -> - Ellipse.find edges xEdges yEdges radiusRange windowSize factorNbPick) - - let cells = logTime "Classifier" (fun () -> Classifier.findCells ellipses parasites kmediansResults.fg config) - *) - let cells = [] + let cells = logTime "Classifier" (fun () -> Classifier.findCells ellipses parasites filteredGreenWhitoutStain config) // Output pictures if debug flag is set. - match config.debug with + match config.Debug with | DebugOn output -> - let buildFileName postfix = System.IO.Path.Combine(output, name + postfix) + let dirPath = System.IO.Path.Combine(output, name) + System.IO.Directory.CreateDirectory dirPath |> ignore + + let buildFileName postfix = System.IO.Path.Combine(dirPath, 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") - let imgEllipses = img.Copy() - drawEllipses imgEllipses ellipses (Bgr(0.0, 240.0, 240.0)) - saveImg imgEllipses (buildFileName " - ellipses.png") + let imgAllEllipses = img.Copy() + drawEllipses imgAllEllipses allEllipses (Bgr(0.0, 240.0, 240.0)) 0.05 + saveImg imgAllEllipses (buildFileName " - ellipses - all.png") - saveImg (kmediansResults.fg * 255.0) (buildFileName " - foreground.png") + let imgEllipses = filteredGreenWhitoutStain.Convert() + drawEllipses imgEllipses ellipses (Bgr(0.0, 240.0, 240.0)) 1.0 + saveImg imgEllipses (buildFileName " - ellipses.png") let imgCells = img.Copy() drawCells imgCells false cells @@ -96,7 +70,24 @@ 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") + + let filteredGreenMaxima = gaussianFilter greenFloat config.Parameters.preFilterSigma + for m in ImgTools.findMaxima filteredGreenMaxima do + ImgTools.drawPoints filteredGreenMaxima m 255.f + saveImg filteredGreenMaxima (buildFileName " - filtered - maxima.png") + + saveImg filteredGreen (buildFileName " - filtered.png") + saveImg filteredGreenWhitoutStain (buildFileName " - filtered closed stain.png") + //saveImg filteredGreenWhitoutInfection (buildFileName " - filtered closed infection.png") + + saveImg green (buildFileName " - green.png") + + use blue = img.Item(0) + saveImg blue (buildFileName " - blue.png") + + use red = img.Item(2) + saveImg red (buildFileName " - red.png") | _ -> () cells