X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemiaCore%2FImgTools%2FEdges.fs;h=7c3e6d325be4fbca03bf41789d7f1e1b51a86513;hp=63ec80a188cc2a0196f68126d66367cefca610df;hb=2d712781def419c9acc98368f7102b19b064f16d;hpb=d715615d0b1da40fd10e9dbabbd4530cd5125a19

diff --git a/Parasitemia/ParasitemiaCore/ImgTools/Edges.fs b/Parasitemia/ParasitemiaCore/ImgTools/Edges.fs
index 63ec80a..7c3e6d3 100644
--- a/Parasitemia/ParasitemiaCore/ImgTools/Edges.fs
+++ b/Parasitemia/ParasitemiaCore/ImgTools/Edges.fs
@@ -25,27 +25,27 @@ let find (img : Image<Gray, float32>) : Matrix<byte> * Matrix<float32> * Matrix<
     let h = img.Height
 
     use sobelKernel =
-        new Matrix<float32>(
+        new Matrix<float32> (
             array2D [[ -1.0f; 0.0f; 1.0f ]
                      [ -2.0f; 0.0f; 2.0f ]
                      [ -1.0f; 0.0f; 1.0f ]]
         )
 
-    let xGradient = new Matrix<float32>(img.Size)
-    let yGradient = new Matrix<float32>(img.Size)
-    CvInvoke.Filter2D(img, xGradient, sobelKernel, Point(1, 1))
-    CvInvoke.Filter2D(img, yGradient, sobelKernel.Transpose(), Point(1, 1))
+    let xGradient = new Matrix<float32> (img.Size)
+    let yGradient = new Matrix<float32> (img.Size)
+    CvInvoke.Filter2D (img, xGradient, sobelKernel, Point (1, 1))
+    CvInvoke.Filter2D (img, yGradient, sobelKernel.Transpose (), Point (1, 1))
 
-    use magnitudes = new Matrix<float32>(xGradient.Size)
-    use angles = new Matrix<float32>(xGradient.Size)
-    CvInvoke.CartToPolar(xGradient, yGradient, magnitudes, angles) // Compute the magnitudes and angles. The angles are between 0 and 2 * pi.
+    use magnitudes = new Matrix<float32> (xGradient.Size)
+    use angles = new Matrix<float32> (xGradient.Size)
+    CvInvoke.CartToPolar (xGradient, yGradient, magnitudes, angles) // Compute the magnitudes and angles. The angles are between 0 and 2 * pi.
 
     let thresholdHigh, thresholdLow =
         let threshold, _, _ = otsu (histogramMat magnitudes 300)
         threshold + (sensibilityHigh * threshold), threshold - (sensibilityLow * threshold)
 
     // Non-maximum suppression.
-    use nms = new Matrix<byte>(xGradient.Size)
+    use nms = new Matrix<byte> (xGradient.Size)
 
     let nmsData = nms.Data
     let anglesData = angles.Data
@@ -88,18 +88,18 @@ let find (img : Image<Gray, float32>) : Matrix<byte> * Matrix<float32> * Matrix<
 
     // suppressMConnections nms // It's not helpful for the rest of the process (ellipse detection).
 
-    let edges = new Matrix<byte>(xGradient.Size)
+    let edges = new Matrix<byte> (xGradient.Size)
     let edgesData = edges.Data
 
     // Hysteresis thresholding.
-    let toVisit = Stack<Point>()
+    let toVisit = Stack<Point> ()
     for i = 0 to h - 1 do
         for j = 0 to w - 1 do
             if nmsData.[i, j] = 1uy && magnitudesData.[i, j] >= thresholdHigh then
                 nmsData.[i, j] <- 0uy
-                toVisit.Push(Point(j, i))
+                toVisit.Push (Point (j, i))
                 while toVisit.Count > 0 do
-                    let p = toVisit.Pop()
+                    let p = toVisit.Pop ()
                     edgesData.[p.Y, p.X] <- 1uy
                     for i' = -1 to 1  do
                         for j' = -1 to 1 do
@@ -108,6 +108,6 @@ let find (img : Image<Gray, float32>) : Matrix<byte> * Matrix<float32> * Matrix<
                                 let nj = p.X + j'
                                 if ni >= 0 && ni < h && nj >= 0 && nj < w && nmsData.[ni, nj] = 1uy then
                                     nmsData.[ni, nj] <- 0uy
-                                    toVisit.Push(Point(nj, ni))
+                                    toVisit.Push (Point (nj, ni))
 
     edges, xGradient, yGradient
\ No newline at end of file