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
statusMessageTimer.Start ()
let highlightRBC (rbc : RBC) (highlight : bool) =
- // let rbc = frame.Tag :?> RBC
- // Find the two frames in previews and current image.
+ 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. * rbcFrame.border.StrokeThickness
- if not rbc.infected && not rbc.setManually && not displayHealthy then rbcFrame.Opacity <- 1.
- else
- rbcFrame.border.StrokeThickness <- rbcFrame.border.StrokeThickness / 3.
- 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)
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
// 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
// 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
// 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
// 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
// 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
// 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
// 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
// Toggle RBC highlight.
win.InputBindings.Add (
Input.KeyBinding (
- ViewModule.FunCommand (
+ Utils.FunCommand (
(
fun obj ->
win.menuHightlightRBC.IsChecked <- not win.menuHightlightRBC.IsChecked