X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=Parasitemia%2FParasitemiaUI%2FGUI.fs;h=3b6789408efed6c67719a6580a1f5025f94f6303;hb=3e1a96b6a5648ec75f019b40d4ce4b7e9cae3650;hp=c85017fa1fd581c1eb9ae369f52c6597fffeaedc;hpb=5d1a08f1b121d660228b08d9f931edaed619fdb9;p=master-thesis.git

diff --git a/Parasitemia/ParasitemiaUI/GUI.fs b/Parasitemia/ParasitemiaUI/GUI.fs
index c85017f..3b67894 100644
--- a/Parasitemia/ParasitemiaUI/GUI.fs
+++ b/Parasitemia/ParasitemiaUI/GUI.fs
@@ -82,16 +82,23 @@ let run (defaultConfig : Config) (fileToOpen : string option) =
         statusMessageTimer.Start ()
 
     let highlightRBC (rbc : RBC) (highlight : bool) =
-        let strokeThickness = frameStrokeThickness ()
+        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>).Concat(win.canvasCurrentImage.Children |> Seq.cast<RBCFrame>) do
+        for rbcFrame in win.stackRBC.Children |> Seq.cast<RBCFrame> do
             if (rbcFrame.Tag :?> RBC) = rbc then
-                if highlight then
-                    rbcFrame.border.StrokeThickness <- 3. * 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.
+                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)
@@ -583,7 +590,7 @@ let run (defaultConfig : Config) (fileToOpen : string option) =
     // Save.
     win.InputBindings.Add (
         Input.KeyBinding (
-            ViewModule.FunCommand ((fun obj -> saveCurrentDocument ()), (fun obj -> true)),
+            Utils.FunCommand ((fun obj -> saveCurrentDocument ()), (fun obj -> true)),
             Input.KeyGesture (Input.Key.S, Input.ModifierKeys.Control)
         )
     ) |> ignore
@@ -591,7 +598,7 @@ let run (defaultConfig : Config) (fileToOpen : string option) =
     // Save as.
     win.InputBindings.Add (
         Input.KeyBinding (
-            ViewModule.FunCommand ((fun obj -> saveCurrentDocumentAsNewFile ()), (fun obj -> true)),
+            Utils.FunCommand ((fun obj -> saveCurrentDocumentAsNewFile ()), (fun obj -> true)),
             Input.KeyGesture (Input.Key.S, Input.ModifierKeys.Control ||| Input.ModifierKeys.Shift)
         )
     ) |> ignore
@@ -599,7 +606,7 @@ let run (defaultConfig : Config) (fileToOpen : string option) =
     // Open.
     win.InputBindings.Add (
         Input.KeyBinding (
-            ViewModule.FunCommand ((fun obj -> askLoadFile ()), (fun obj -> true)),
+            Utils.FunCommand ((fun obj -> askLoadFile ()), (fun obj -> true)),
             Input.KeyGesture (Input.Key.O, Input.ModifierKeys.Control)
         )
     ) |> ignore
@@ -607,7 +614,7 @@ let run (defaultConfig : Config) (fileToOpen : string option) =
     // New file.
     win.InputBindings.Add (
         Input.KeyBinding (
-            ViewModule.FunCommand ((fun obj -> newFile ()), (fun obj -> true)),
+            Utils.FunCommand ((fun obj -> newFile ()), (fun obj -> true)),
             Input.KeyGesture (Input.Key.N, Input.ModifierKeys.Control)
         )
     ) |> ignore
@@ -615,7 +622,7 @@ let run (defaultConfig : Config) (fileToOpen : string option) =
     // Export results.
     win.InputBindings.Add (
         Input.KeyBinding (
-            ViewModule.FunCommand ((fun obj -> exportResults ()), (fun obj -> true)),
+            Utils.FunCommand ((fun obj -> exportResults ()), (fun obj -> true)),
             Input.KeyGesture (Input.Key.E, Input.ModifierKeys.Control)
         )
     ) |> ignore
@@ -623,7 +630,7 @@ let run (defaultConfig : Config) (fileToOpen : string option) =
     // Import an image.
     win.InputBindings.Add (
         Input.KeyBinding (
-            ViewModule.FunCommand ((fun obj -> importImage ()), (fun obj -> true)),
+            Utils.FunCommand ((fun obj -> importImage ()), (fun obj -> true)),
             Input.KeyGesture (Input.Key.A, Input.ModifierKeys.Control)
         )
     ) |> ignore
@@ -631,7 +638,7 @@ let run (defaultConfig : Config) (fileToOpen : string option) =
     // Show analysis dialog.
     win.InputBindings.Add (
         Input.KeyBinding (
-            ViewModule.FunCommand ((fun obj -> showAnalysisWindow ()), (fun obj -> state.SourceImages.Count () > 0)),
+            Utils.FunCommand ((fun obj -> showAnalysisWindow ()), (fun obj -> state.SourceImages.Count () > 0)),
             Input.KeyGesture (Input.Key.Y, Input.ModifierKeys.Control)
         )
     ) |> ignore
@@ -639,7 +646,7 @@ let run (defaultConfig : Config) (fileToOpen : string option) =
     // Toggle RBC highlight.
     win.InputBindings.Add (
         Input.KeyBinding (
-            ViewModule.FunCommand (
+            Utils.FunCommand (
                 (
                     fun obj ->
                         win.menuHightlightRBC.IsChecked <- not win.menuHightlightRBC.IsChecked