X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemiaUI%2FGUI.fs;h=69ae1f99a2061b5038b1bfa96476bdb7f2012483;hp=89f38e31dfb015326743b3fe782e462240567686;hb=a498bc4223a22cd38b91b3348912301e15c077ae;hpb=e37e89a261df15d46d5128f18f9764d1cf81fd86

diff --git a/Parasitemia/ParasitemiaUI/GUI.fs b/Parasitemia/ParasitemiaUI/GUI.fs
index 89f38e3..69ae1f9 100644
--- a/Parasitemia/ParasitemiaUI/GUI.fs
+++ b/Parasitemia/ParasitemiaUI/GUI.fs
@@ -50,11 +50,11 @@ let run (defaultConfig : Config) (fileToOpen : string option) =
         frame.manuallyAdded.Fill <- color
         frame.border.Stroke <- color
 
-    let frameStrokeThickness (averageRBCSize : float) =
-        max 1. (averageRBCSize / 60.)
+    let frameStrokeThickness () =
+        state.CurrentImage |> Option.map (fun img -> max 1. (img.AverageRBCSize / 100.)) |> Option.defaultValue 1.
 
-    let frameFontSize (averageRBCSize : float) =
-        max 1. (averageRBCSize / 6.)
+    let frameFontSize () =
+        state.CurrentImage |> Option.map (fun img -> max 1. (img.AverageRBCSize / 6.)) |> Option.defaultValue 1.
 
     let createRBCFrameFromExisting (srcImg : SourceImage) (rbc : RBC) (frame : RBCFrame) (frameThickness : float) (fontSize : float) (isTextBelow : bool) : RBCFrame =
         frame.Visibility <- Visibility.Visible
@@ -81,14 +81,24 @@ let run (defaultConfig : Config) (fileToOpen : string option) =
         statusMessageTimer.Stop ()
         statusMessageTimer.Start ()
 
-    let highlightRBCFrame (frame : RBCFrame) (highlight : bool) =
-        let rbc = frame.Tag :?> RBC
-        if highlight then
-            frame.border.StrokeThickness <- 3. * frame.border.StrokeThickness
-            if not rbc.infected && not rbc.setManually && not displayHealthy then frame.Opacity <- 1.
-        else
-            frame.border.StrokeThickness <- frame.border.StrokeThickness / 3.
-            if not rbc.infected && not rbc.setManually && not displayHealthy then frame.Opacity <- 0.
+    let highlightRBC (rbc : RBC) (highlight : bool) =
+        let highlightRBCFrame (rbcFrame : RBCFrame) (strokeThickness : float) =
+            if highlight then
+                rbcFrame.border.StrokeThickness <- 2. * strokeThickness
+                if not rbc.infected && not rbc.setManually && not displayHealthy then rbcFrame.Opacity <- 1.
+            else
+                rbcFrame.border.StrokeThickness <- strokeThickness
+                if not rbc.infected && not rbc.setManually && not displayHealthy then rbcFrame.Opacity <- 0.
+
+        for rbcFrame in win.stackRBC.Children |> Seq.cast<RBCFrame> do
+            if (rbcFrame.Tag :?> RBC) = rbc then
+                highlightRBCFrame rbcFrame 1.
+
+        let strokeThicknessCanvas = frameStrokeThickness ()
+
+        for rbcFrame in win.canvasCurrentImage.Children |> Seq.cast<RBCFrame> do
+            if (rbcFrame.Tag :?> RBC) = rbc then
+                highlightRBCFrame rbcFrame strokeThicknessCanvas
 
     let zoomToRBC (rbc : RBC) =
         win.scrollViewCurrentImage.ScrollToHorizontalOffset (rbc.center.X * currentScale - win.scrollViewCurrentImage.ViewportWidth / 2. + win.borderCurrentImage.BorderThickness.Left)
@@ -194,9 +204,9 @@ let run (defaultConfig : Config) (fileToOpen : string option) =
                     frame.menuRBCSetAsHealthy.Visibility <- Visibility.Collapsed
                     frame.menuRBCSetAsInfected.Visibility <- Visibility.Visible
         )
-        frame.ContextMenuClosing.AddHandler (fun obj args -> if not frame.IsMouseOver then highlightRBCFrame frame false )
-        frame.MouseEnter.AddHandler (fun obj args -> highlightRBCFrame frame true)
-        frame.MouseLeave.AddHandler (fun obj args -> if not frame.grid.ContextMenu.IsOpen then highlightRBCFrame frame false)
+        frame.ContextMenuClosing.AddHandler (fun obj args -> if not frame.IsMouseOver then highlightRBC (frame.Tag :?> RBC) false )
+        frame.MouseEnter.AddHandler (fun obj args -> highlightRBC (frame.Tag :?> RBC) true)
+        frame.MouseLeave.AddHandler (fun obj args -> if not frame.grid.ContextMenu.IsOpen then highlightRBC (frame.Tag :?> RBC) false)
         frame
 
     and updateRBCFramesPreview () =
@@ -228,8 +238,8 @@ let run (defaultConfig : Config) (fileToOpen : string option) =
         match state.CurrentImage with
         | Some srcImg ->
             let mutable currentCanvas = 0
-            let strokeThickness = frameStrokeThickness srcImg.AverageRBCSize
-            let fontSize = frameFontSize srcImg.AverageRBCSize
+            let strokeThickness = frameStrokeThickness ()
+            let fontSize = frameFontSize ()
             for rbc in srcImg.RBCs do
                 let frame =
                     if currentCanvas < win.canvasCurrentImage.Children.Count then