X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FMainAnalysis.fs;h=a240878a6cd133153fdb2b76827f0a2ca8f8b62a;hp=fd341ac5c44d22445229deba12fbe614dab61ab7;hb=d0c85068bb98a7999ed994f02669befa70edd5f9;hpb=ca3f764fc93defb480bb9b1c34e9c41447cc07e0 diff --git a/Parasitemia/Parasitemia/MainAnalysis.fs b/Parasitemia/Parasitemia/MainAnalysis.fs index fd341ac..a240878 100644 --- a/Parasitemia/Parasitemia/MainAnalysis.fs +++ b/Parasitemia/Parasitemia/MainAnalysis.fs @@ -20,7 +20,7 @@ let doAnalysis (img: Image) (name: string) (config: Config) : Cell li let greenFloat = green.Convert() - let filteredGreen = gaussianFilter green config.Parameters.preFilterSigma + let filteredGreen = gaussianFilter greenFloat config.Parameters.preFilterSigma (*let maximaImg = filteredGreen.Copy() let maxima = logTime "maxima" (fun () -> ImgTools.findMaxima maximaImg) @@ -31,61 +31,24 @@ let doAnalysis (img: Image) (name: string) (config: Config) : Cell li logTime "areaOpen1" (fun () -> ImgTools.areaOpen greenOpen1 2000)*) let initialAreaOpen = 2000 - logTime "areaOpen 1" (fun () -> ImgTools.areaOpen filteredGreen 2000) + logTime "areaOpen 1" (fun () -> ImgTools.areaOpenF filteredGreen initialAreaOpen) config.RBCRadius <- Granulometry.findRadius filteredGreen (10, 100) 0.5 |> float let secondAreaOpen = int <| config.RBCArea / 3. if secondAreaOpen > initialAreaOpen then - logTime "areaOpen 2" (fun () -> ImgTools.areaOpen filteredGreen secondAreaOpen) - - let filteredGreenFloat = filteredGreen.Convert() // Is it neccessary? - - let parasites, filteredGreenWhitoutInfection, filteredGreenWhitoutStain = ParasitesMarker2.find filteredGreen filteredGreenFloat config - let filteredGreenWhitoutInfectionFloat = filteredGreenWhitoutInfection.Convert() - let filteredGreenWhitoutStainFloat = filteredGreenWhitoutStain.Convert() - - 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)) - - use xEdges = filteredGreenWhitoutStainFloat.Convolution(sobelKernel).Convert() - use yEdges = filteredGreenWhitoutStainFloat.Convolution(sobelKernel.Transpose()).Convert() - - 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 - - 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 - - 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 "areaOpen 2" (fun () -> ImgTools.areaOpenF filteredGreen secondAreaOpen) + + let parasites, filteredGreenWhitoutInfection, filteredGreenWhitoutStain = ParasitesMarker.find filteredGreen config + //let parasites, filteredGreenWhitoutInfection, filteredGreenWhitoutStain = ParasitesMarker.findMa greenFloat filteredGreenFloat config + + let edges, xGradient, yGradient = ImgTools.findEdges filteredGreenWhitoutStain + logTime "Removing small connected components from thinning" (fun () -> removeArea edges 12) let allEllipses, ellipses = logTime "Finding ellipses" (fun () -> - let matchingEllipses = Ellipse.find edges xEdges yEdges config + let matchingEllipses = Ellipse.find edges xGradient yGradient config matchingEllipses.Ellipses, matchingEllipses.PrunedEllipses ) let cells = logTime "Classifier" (fun () -> Classifier.findCells ellipses parasites filteredGreenWhitoutStain config) @@ -98,6 +61,8 @@ let doAnalysis (img: Image) (name: string) (config: Config) : Cell li let buildFileName postfix = System.IO.Path.Combine(dirPath, name + postfix) + //saveImg canny (buildFileName " - canny.png") + saveMat (edges * 255.0) (buildFileName " - edges.png") saveImg parasites.darkStain (buildFileName " - parasites - dark stain.png") @@ -105,15 +70,13 @@ let doAnalysis (img: Image) (name: string) (config: Config) : Cell li saveImg parasites.infection (buildFileName " - parasites - infection.png") let imgAllEllipses = img.Copy() - drawEllipses imgAllEllipses allEllipses (Bgr(0.0, 240.0, 240.0)) 0.1 + drawEllipses imgAllEllipses allEllipses (Bgr(0.0, 240.0, 240.0)) 0.05 saveImg imgAllEllipses (buildFileName " - ellipses - all.png") let imgEllipses = img.Copy() drawEllipses imgEllipses ellipses (Bgr(0.0, 240.0, 240.0)) 1.0 saveImg imgEllipses (buildFileName " - ellipses.png") - // saveImg (kmediansResults.fg * 255.0) (buildFileName " - foreground.png") - let imgCells = img.Copy() drawCells imgCells false cells saveImg imgCells (buildFileName " - cells.png") @@ -122,18 +85,15 @@ let doAnalysis (img: Image) (name: string) (config: Config) : Cell li drawCells imgCells' true cells saveImg imgCells' (buildFileName " - cells - full.png") - let filteredGreenMaxima = gaussianFilter green config.Parameters.preFilterSigma + let filteredGreenMaxima = gaussianFilter greenFloat config.Parameters.preFilterSigma for m in ImgTools.findMaxima filteredGreenMaxima do - ImgTools.drawPoints filteredGreenMaxima m 255uy + 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 parasitesMarker (buildFileName " - parasites (area closing).png") - saveImg stainMarker (buildFileName " - stain (area closing).png")*) - saveImg green (buildFileName " - green.png") use blue = scaledImg.Item(0)