X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemiaUI%2FGUI.fs;h=89f38e31dfb015326743b3fe782e462240567686;hp=d78c202dc3a9ee56b9e15584795461d64bb31c02;hb=e37e89a261df15d46d5128f18f9764d1cf81fd86;hpb=77cb62e17c3e8e7de65b8dab6769be84ca794b92 diff --git a/Parasitemia/ParasitemiaUI/GUI.fs b/Parasitemia/ParasitemiaUI/GUI.fs index d78c202..89f38e3 100644 --- a/Parasitemia/ParasitemiaUI/GUI.fs +++ b/Parasitemia/ParasitemiaUI/GUI.fs @@ -5,23 +5,19 @@ open System.IO open System.Linq open System.Windows open System.Windows.Media -open System.Windows.Markup -open System.Windows.Shapes open System.Windows.Controls -open System.Diagnostics open Microsoft.Win32 // For the common dialogs. -open Emgu.CV.WPF - open Logger +open ParasitemiaUIControls open ParasitemiaCore.Config open ParasitemiaCore.Utils open Types let run (defaultConfig : Config) (fileToOpen : string option) = let app = new Application () - let win = Views.MainWindow () + let win = MainWindow () let state = State.State defaultConfig let mutable currentScale = 1. @@ -47,7 +43,7 @@ let run (defaultConfig : Config) (fileToOpen : string option) = ) ) - let setRBCFrameStyle (srcImg : SourceImage) (rbc : RBC) (frame : Views.RBCFrame) = + let setRBCFrameStyle (srcImg : SourceImage) (rbc : RBC) (frame : RBCFrame) = frame.Opacity <- if displayHealthy || rbc.setManually || rbc.infected then 1. else 0. let color = if rbc.infected then srcImg.InfectedRBCColor else srcImg.HealthyRBCColor frame.manuallyAdded.Visibility <- if rbc.setManually then Visibility.Visible else Visibility.Hidden @@ -58,13 +54,14 @@ let run (defaultConfig : Config) (fileToOpen : string option) = max 1. (averageRBCSize / 60.) let frameFontSize (averageRBCSize : float) = - max 1. (averageRBCSize / 8.) + max 1. (averageRBCSize / 6.) - let RBCFrameFromExisting (srcImg : SourceImage) (rbc : RBC) (frame : Views.RBCFrame) (frameThickness : float) (fontSize : float) : Views.RBCFrame = + let createRBCFrameFromExisting (srcImg : SourceImage) (rbc : RBC) (frame : RBCFrame) (frameThickness : float) (fontSize : float) (isTextBelow : bool) : RBCFrame = frame.Visibility <- Visibility.Visible frame.Width <- rbc.size.Width frame.Height <- rbc.size.Height frame.Tag <- rbc + frame.IsTextBelow <- isTextBelow setRBCFrameStyle srcImg rbc frame frame.border.StrokeThickness <- frameThickness frame.txtRBCNumber.Text <- string rbc.num @@ -84,7 +81,7 @@ let run (defaultConfig : Config) (fileToOpen : string option) = statusMessageTimer.Stop () statusMessageTimer.Start () - let highlightRBCFrame (frame : Views.RBCFrame) (highlight : bool) = + let highlightRBCFrame (frame : RBCFrame) (highlight : bool) = let rbc = frame.Tag :?> RBC if highlight then frame.border.StrokeThickness <- 3. * frame.border.StrokeThickness @@ -145,7 +142,7 @@ let run (defaultConfig : Config) (fileToOpen : string option) = ) let updateViewportPreview () = - for preview in win.stackPreviews.Children |> Seq.cast do + for preview in win.stackPreviews.Children |> Seq.cast do let srcImg = preview.Tag :?> SourceImage if Some srcImg = state.CurrentImage then preview.viewport.Visibility <- Visibility.Visible @@ -173,7 +170,7 @@ let run (defaultConfig : Config) (fileToOpen : string option) = let rec setAsInfected (srcImg : SourceImage) (rbc : RBC) (infected : bool) = state.SetAsInfected rbc infected win.canvasCurrentImage.Children - |> Seq.cast + |> Seq.cast |> Seq.iter ( fun frame -> if (frame.Tag :?> RBC) = rbc then @@ -183,8 +180,8 @@ let run (defaultConfig : Config) (fileToOpen : string option) = updateCurrentImageInformation () updateGlobalParasitemia () - and RBCFrame (srcImg : SourceImage) (rbc : RBC) (frameThickness : float) (fontSize : float) : Views.RBCFrame = - let frame = RBCFrameFromExisting srcImg rbc (Views.RBCFrame ()) frameThickness fontSize + and createRBCFrame (srcImg : SourceImage) (rbc : RBC) (frameThickness : float) (fontSize : float) (isTextBelow : bool) : RBCFrame = + let frame = createRBCFrameFromExisting srcImg rbc (RBCFrame ()) frameThickness fontSize isTextBelow frame.SetValue (Panel.ZIndexProperty, Int32.MaxValue - rbc.num) // To be sure the frame.menuRBCSetAsHealthy.Click.AddHandler (fun obj args -> setAsInfected srcImg (frame.Tag :?> RBC) false) frame.menuRBCSetAsInfected.Click.AddHandler (fun obj args -> setAsInfected srcImg (frame.Tag :?> RBC) true) @@ -209,9 +206,9 @@ let run (defaultConfig : Config) (fileToOpen : string option) = for rbc in srcImg.RBCs |> List.filter (fun rbc -> displayHealthy || rbc.infected) do let previewInfected = if currentPreview < win.stackRBC.Children.Count then - RBCFrameFromExisting srcImg rbc (win.stackRBC.Children.[currentPreview] :?> Views.RBCFrame) 1. 12. + createRBCFrameFromExisting srcImg rbc (win.stackRBC.Children.[currentPreview] :?> RBCFrame) 1. 12. false else - let f = RBCFrame srcImg rbc 1. 12. + let f = createRBCFrame srcImg rbc 1. 12. false f.MouseLeftButtonUp.AddHandler (fun obj args -> zoomToRBC (f.Tag :?> RBC)) win.stackRBC.Children.Add f |> ignore f @@ -236,9 +233,9 @@ let run (defaultConfig : Config) (fileToOpen : string option) = for rbc in srcImg.RBCs do let frame = if currentCanvas < win.canvasCurrentImage.Children.Count then - RBCFrameFromExisting srcImg rbc (win.canvasCurrentImage.Children.[currentCanvas] :?> Views.RBCFrame) strokeThickness fontSize + createRBCFrameFromExisting srcImg rbc (win.canvasCurrentImage.Children.[currentCanvas] :?> RBCFrame) strokeThickness fontSize true else - let f = RBCFrame srcImg rbc strokeThickness fontSize + let f = createRBCFrame srcImg rbc strokeThickness fontSize true win.canvasCurrentImage.Children.Add f |> ignore f @@ -303,7 +300,7 @@ let run (defaultConfig : Config) (fileToOpen : string option) = // Highlight the preview. win.stackPreviews.Children - |> Seq.cast + |> Seq.cast |> Seq.iter (fun preview -> preview.border.BorderThickness <- Thickness (if preview.Tag = (srcImg :> Object) then 3. else 0.)) win.canvasCurrentImage.Height <- float srcImg.Img.Height @@ -328,7 +325,7 @@ let run (defaultConfig : Config) (fileToOpen : string option) = updateCurrentImage () let addPreview (srcImg : SourceImage) = - let imgCtrl = Views.ImageSourcePreview (Margin = Thickness 3.) + let imgCtrl = ImageSourcePreview (Margin = Thickness 3.) imgCtrl.menuRemoveImage.Click.AddHandler ( fun obj args -> @@ -342,11 +339,11 @@ let run (defaultConfig : Config) (fileToOpen : string option) = updateGlobalParasitemia () // Update image numbers. - win.stackPreviews.Children |> Seq.cast |> Seq.iter (fun imgPreview -> imgPreview.txtImageNumber.Text <- (imgPreview.Tag :?> SourceImage).Num.ToString ()) + win.stackPreviews.Children |> Seq.cast |> Seq.iter (fun imgPreview -> imgPreview.txtImageNumber.Text <- (imgPreview.Tag :?> SourceImage).RomanNum) ) imgCtrl.Tag <- srcImg - imgCtrl.txtImageNumber.Text <- string srcImg.Num + imgCtrl.txtImageNumber.Text <- string srcImg.RomanNum let width = 200 let height = srcImg.Img.Height * width / srcImg.Img.Width imgCtrl.imagePreview.Source <- BitmapSourceConvert.ToBitmapSource (srcImg.Img.Resize (width, height, Emgu.CV.CvEnum.Inter.Cubic))