X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FEllipse.fs;h=73771bee58873a88448b4ad471a3a6288f44d93f;hb=bef2e9f0bf1bba21d4c988fdf654c2dc303ec34a;hp=33333bf57d91dd7408e00d942fa63ad83d6127cc;hpb=84fdf7404133803fdf0dc867a4da68a144975191;p=master-thesis.git

diff --git a/Parasitemia/Parasitemia/Ellipse.fs b/Parasitemia/Parasitemia/Ellipse.fs
index 33333bf..73771be 100644
--- a/Parasitemia/Parasitemia/Ellipse.fs
+++ b/Parasitemia/Parasitemia/Ellipse.fs
@@ -204,11 +204,11 @@ let private areVectorsValid (p1x: float) (p1y: float) (p2x: float) (p2y: float)
 
 
 let find (edges: Matrix<byte>)
-         (xDir: Image<Gray, float>)
-         (yDir: Image<Gray, float>)
+         (xGradient: Image<Gray, float>)
+         (yGradient: Image<Gray, float>)
          (config: Config) : MatchingEllipses =
 
-    let r1, r2 = config.Parameters.scale * config.RBCMin, config.Parameters.scale * config.RBCMax // FIXME: scale factor should be applied in Config!?
+    let r1, r2 = config.RBCMinRadius, config.RBCMaxRadius
     let windowSize = roundInt (config.Parameters.factorWindowSize * r2)
     let factorNbPick = config.Parameters.factorNbPick
 
@@ -227,8 +227,8 @@ let find (edges: Matrix<byte>)
     let currentElements = List<(int * int)>()
 
     let edgesData = edges.Data
-    let xDirData = xDir.Data
-    let yDirData = yDir.Data
+    let xDirData = xGradient.Data
+    let yDirData = yGradient.Data
 
     let rng = Random(42)