X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FGUI%2FGUI.fs;h=2aadefef86e0ace0ea6dd03a3992a1f18423f163;hp=c6e639069bde08c813f76c3eb525e31ab690430f;hb=999a48b8eb25c92e4403c9280fd4fe68f9bc4b7b;hpb=f4fdf61ef98b913129ddb771392c0bcb1475e6fb diff --git a/Parasitemia/Parasitemia/GUI/GUI.fs b/Parasitemia/Parasitemia/GUI/GUI.fs index c6e6390..2aadefe 100644 --- a/Parasitemia/Parasitemia/GUI/GUI.fs +++ b/Parasitemia/Parasitemia/GUI/GUI.fs @@ -10,8 +10,6 @@ open System.Windows.Controls open System.Diagnostics open Microsoft.Win32 // For the common dialogs. -//open Emgu.CV -//open Emgu.CV.Structure open Emgu.CV.WPF open Config @@ -25,8 +23,8 @@ let run (defaultConfig: Config) = // Utils.log <- (fun m -> log mainWindow m) - let colorRBCHealthy = Brushes.Green - let colorRBCInfected = Brushes.Yellow + let colorRBCHealthy = Brushes.YellowGreen + let colorRBCInfected = Brushes.Red let state = State.State() @@ -51,22 +49,44 @@ let run (defaultConfig: Config) = state.PatientID <- txtPatient.Text let setCurrentImage (srcImg: SourceImage) = + state.CurrentImage <- Some srcImg + + // Highlight the preview. + stackPreviews.Children + |> Seq.cast + |> Seq.iter (fun preview -> preview.border.BorderThickness <- Thickness(if preview.lblImageNumber.Content = box srcImg.num then 3. else 0.)) + canvasCurrentImage.Height <- float srcImg.img.Height canvasCurrentImage.Width <- float srcImg.img.Width canvasCurrentImage.Background <- ImageBrush(BitmapSourceConvert.ToBitmapSource(srcImg.img)) // Remove all image canvas children and add the RBC. canvasCurrentImage.Children.Clear() - for rbc in (*srcImg.rbcs*) [{ num = 1; infected = true; addedManually = false; removed = false; center = Point(100., 100.); size = Size(40., 40.); stainArea = 10 }] do + for rbc in srcImg.rbcs do let rectangle = Rectangle( Height = rbc.size.Height, Width = rbc.size.Width, Stroke = (if rbc.infected then colorRBCInfected else colorRBCHealthy), - StrokeThickness = 1.) - Canvas.SetLeft(rectangle, rbc.center.X + rbc.size.Width / 2.) - Canvas.SetTop(rectangle, rbc.center.Y + rbc.size.Height / 2.) + StrokeThickness = 1., + Fill = SolidColorBrush(Color.FromArgb(0uy, 0uy, 0uy, 0uy)), + Tag = rbc, + Opacity = if rbc.infected then 1. else 0.) + Canvas.SetLeft(rectangle, rbc.center.X - rbc.size.Width / 2.) + Canvas.SetTop(rectangle, rbc.center.Y - rbc.size.Height / 2.) canvasCurrentImage.Children.Add(rectangle) |> ignore + rectangle.MouseEnter.AddHandler( + fun obj args -> match obj with + | :? Rectangle as r -> + r.StrokeThickness <- 3. + if not (r.Tag :?> RBC).infected then r.Opacity <- 1. + | _ -> ()) + rectangle.MouseLeave.AddHandler( + fun obj args -> match obj with + | :? Rectangle as r -> + r.StrokeThickness <- 1. + if not (r.Tag :?> RBC).infected then r.Opacity <- 0. + | _ -> ()) let addPreview (srcImg: SourceImage) = let imgCtrl = Views.ImageSourcePreview(Margin = Thickness(3.)) @@ -75,6 +95,7 @@ let run (defaultConfig: Config) = let height = srcImg.img.Height * width / srcImg.img.Width imgCtrl.imagePreview.Source <- BitmapSourceConvert.ToBitmapSource(srcImg.img.Resize(width, height, Emgu.CV.CvEnum.Inter.Cubic)) stackPreviews.Children.Add(imgCtrl) |> ignore + imgCtrl.MouseLeftButtonUp.AddHandler(fun obj args -> setCurrentImage (state.SourceImages |> Seq.find (fun i -> box i.num = (obj :?> Views.ImageSourcePreview).lblImageNumber.Content))) let updatePreviews () = stackPreviews.Children.Clear () @@ -93,7 +114,7 @@ let run (defaultConfig: Config) = synchronizeState () if state.FilePath = "" then - let dialog = SaveFileDialog(AddExtension = true, DefaultExt = Pia.extension, Filter = Pia.filter); + let dialog = SaveFileDialog(AddExtension = true, DefaultExt = PiaZ.extension, Filter = PiaZ.filter); let res = dialog.ShowDialog() if res.HasValue && res.Value then @@ -104,7 +125,7 @@ let run (defaultConfig: Config) = loadFile.Click.AddHandler(fun obj args -> // TODO: if current state not saved and not empty, ask to save it. - let dialog = OpenFileDialog(Filter = Pia.filter) + let dialog = OpenFileDialog(Filter = PiaZ.filter) let res = dialog.ShowDialog() if res.HasValue && res.Value then @@ -128,7 +149,11 @@ let run (defaultConfig: Config) = then setCurrentImage srcImg) - butStartAnalysis.Click.AddHandler(fun obj args -> ()) + butStartAnalysis.Click.AddHandler(fun obj args -> + let results = ImageAnalysis.doMultipleAnalysis (state.SourceImages |> Seq.map (fun srcImg -> string srcImg.num, srcImg.img) |> Seq.toList) defaultConfig + for id, cells in results do + state.SetResult (int id) cells + ) // Zoom on the current image. let adjustCurrentImageBorders (deltaX: float) (deltaY: float) = @@ -158,8 +183,8 @@ let run (defaultConfig: Config) = scrollViewCurrentImage.ScrollToVerticalOffset(scrollViewCurrentImage.VerticalOffset + deltaY / 8.)) let mutable currentScale = 1. - let mutable maxScale = 5. - let mutable minScale = 0.1 + let mutable maxScale = 4. + let mutable minScale = 0.25 let currentImageScaleTransform = ScaleTransform() canvasCurrentImage.LayoutTransform <- currentImageScaleTransform borderCurrentImage.PreviewMouseWheel.AddHandler(fun obj args -> @@ -212,14 +237,6 @@ let run (defaultConfig: Config) = borderCurrentImage.ReleaseMouseCapture() args.Handled <- true) - (* let txtPatient: Controls.TextBox = ctrl "txtPatient" - txtPatient.TextChanged.AddHandler(fun obj args -> - state.PatientID <- txtPatient.Text) *) - - (* saveFileDialog1.Filter = "txt files (*.txt)|*.txt|All files (*.*)|*.*" ; - saveFileDialog1.FilterIndex = 2 ; - saveFileDialog1.RestoreDirectory = true ; *) - // display mainWindow img mainWindow.Root.Show() app.Run() \ No newline at end of file