X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FImgTools.fs;h=7253390b31813230a69e47926db113f3eba9bd53;hp=f7e5a4af45a969c27d5fe69abdcc5240ffb86d5b;hb=10afa9a402eb88c8e073fe8b0d607faa25230eef;hpb=5b68d946369f998865d2dd330fd3b374b2b9a0ad

diff --git a/Parasitemia/Parasitemia/ImgTools.fs b/Parasitemia/Parasitemia/ImgTools.fs
index f7e5a4a..7253390 100644
--- a/Parasitemia/Parasitemia/ImgTools.fs
+++ b/Parasitemia/Parasitemia/ImgTools.fs
@@ -156,41 +156,37 @@ let saveMat (mat: Matrix<'TDepth>) (filepath: string) =
     mat.CopyTo(img)
     saveImg img filepath
 
-let drawLine (img: Image<'TColor, 'TDepth>) (color: 'TColor) (x0: int) (y0: int) (x1: int) (y1: int) =
-    img.Draw(LineSegment2D(Point(x0, y0), Point(x1, y1)), color, 1);
+let drawLine (img: Image<'TColor, 'TDepth>) (color: 'TColor) (x0: int) (y0: int) (x1: int) (y1: int) (thickness: int) =
+    img.Draw(LineSegment2D(Point(x0, y0), Point(x1, y1)), color, thickness);
 
-let drawLineF (img: Image<'TColor, 'TDepth>) (color: 'TColor) (x0: float) (y0: float) (x1: float) (y1: float) =
-    let x0, y0, x1, y1 = roundInt(x0), roundInt(y0), roundInt(x1), roundInt(y1)
-    drawLine img color x0 y0 x1 y1
+let drawLineF (img: Image<'TColor, 'TDepth>) (color: 'TColor) (x0: float) (y0: float) (x1: float) (y1: float) (thickness: int) =
+    img.Draw(LineSegment2DF(PointF(float32 x0, float32 y0), PointF(float32 x1, float32 y1)), color, thickness, CvEnum.LineType.AntiAlias);
 
-let drawEllipse (img: Image<'TColor, 'TDepth>) (e: Types.Ellipse) (color: 'TColor) =
-    let cosAlpha = cos e.Alpha
-    let sinAlpha = sin e.Alpha
+let drawEllipse (img: Image<'TColor, 'TDepth>) (e: Types.Ellipse) (color: 'TColor) (alpha: float) =
 
-    let mutable x0 = 0.0
-    let mutable y0 = 0.0
-    let mutable first_iteration = true
+    if alpha >= 1.0
+    then
+        img.Draw(Ellipse(PointF(float32 e.Cx, float32 e.Cy), SizeF(2. * e.B |> float32, 2. * e.A |> float32), float32 <| e.Alpha / Math.PI * 180.), color, 1, CvEnum.LineType.AntiAlias)
+    else
+        let windowPosX = e.Cx - e.A - 5.0
+        let gapX = windowPosX - (float (int windowPosX))
 
-    let n = 40
-    let thetaIncrement = 2.0 * Math.PI / (float n)
+        let windowPosY = e.Cy - e.A - 5.0
+        let gapY = windowPosY - (float (int windowPosY))
 
-    for theta in 0.0 .. thetaIncrement .. 2.0 * Math.PI do
-        let cosTheta = cos theta
-        let sinTheta = sin theta
-        let x = e.Cx + cosAlpha * e.A * cosTheta - sinAlpha * e.B * sinTheta
-        let y = e.Cy + sinAlpha * e.A * cosTheta + cosAlpha * e.B * sinTheta
+        let roi = Rectangle(int windowPosX, int windowPosY, 2. * (e.A + 5.0) |> int, 2.* (e.A + 5.0) |> int)
 
-        if not first_iteration
+        img.ROI <- roi
+        if roi = img.ROI // We do not display ellipses touching the edges (FIXME)
         then
-            drawLineF img color x0 y0 x y
-        else
-            first_iteration <- false
+            use i = new Image<'TColor, 'TDepth>(img.ROI.Size)
+            i.Draw(Ellipse(PointF(float32 <| (e.A + 5. + gapX) , float32 <| (e.A + 5. + gapY)), SizeF(2. * e.B |> float32, 2. * e.A |> float32), float32 <| e.Alpha / Math.PI * 180.), color, 1, CvEnum.LineType.AntiAlias)
+            CvInvoke.AddWeighted(img, 1.0, i, alpha, 0.0, img)
+        img.ROI <- Rectangle.Empty
 
-        x0 <- x
-        y0 <- y
 
-let drawEllipses (img: Image<'TColor, 'TDepth>) (ellipses: Types.Ellipse list) (color: 'TColor) =
-    List.iter (fun e -> drawEllipse img e color) ellipses
+let drawEllipses (img: Image<'TColor, 'TDepth>) (ellipses: Types.Ellipse list) (color: 'TColor) (alpha: float) =
+    List.iter (fun e -> drawEllipse img e color alpha) ellipses
 
 
 let rngCell =  System.Random()
@@ -213,13 +209,18 @@ let drawCell (img: Image<Bgr, byte>) (drawCellContent: bool) (c: Types.Cell) =
                     img.Data.[y + dy, x + dx, 1] <- if g + colorG > 255 then 255uy else byte (g + colorG)
                     img.Data.[y + dy, x + dx, 2] <- if r + colorR > 255 then 255uy else byte (r + colorR)
 
-    let crossColor = match c.cellClass with
-                     | Types.HealthyRBC -> Bgr(255.0, 0.0, 0.0)
-                     | Types.InfectedRBC -> Bgr(0.0, 0.0, 255.0)
-                     | Types.Peculiar -> Bgr(0.0, 0.0, 0.0)
+    let crossColor, crossColor2 =
+        match c.cellClass with
+        | Types.HealthyRBC -> Bgr(255., 0., 0.), Bgr(255., 255., 255.)
+        | Types.InfectedRBC -> Bgr(0., 0., 255.), Bgr(120., 120., 255.)
+        | Types.Peculiar -> Bgr(0., 0., 0.), Bgr(80., 80., 80.)
+
+    drawLine img crossColor2 (c.center.X - 3) c.center.Y (c.center.X + 3) c.center.Y 2
+    drawLine img crossColor2 c.center.X (c.center.Y - 3) c.center.X (c.center.Y + 3) 2
+
+    drawLine img crossColor (c.center.X - 3) c.center.Y (c.center.X + 3) c.center.Y 1
+    drawLine img crossColor c.center.X (c.center.Y - 3) c.center.X (c.center.Y + 3) 1
 
-    drawLine img crossColor (c.center.X - 3) c.center.Y (c.center.X + 3) c.center.Y
-    drawLine img crossColor c.center.X (c.center.Y - 3) c.center.X (c.center.Y + 3)
 
 let drawCells (img: Image<Bgr, byte>) (drawCellContent: bool) (cells: Types.Cell list) =
     List.iter (fun c -> drawCell img drawCellContent c) cells
\ No newline at end of file