X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FGUI%2FGUI.fs;h=2132363b1a7cda6378803185d4e0a11445084c1b;hp=f88bc3cc66fd7a3a87cc18634fb489994d43a537;hb=be36fca8c64100b448f268077bcb0726e19f05f7;hpb=807437584bdd3d7b7b33be8282472f81f8cce606

diff --git a/Parasitemia/Parasitemia/GUI/GUI.fs b/Parasitemia/Parasitemia/GUI/GUI.fs
index f88bc3c..2132363 100644
--- a/Parasitemia/Parasitemia/GUI/GUI.fs
+++ b/Parasitemia/Parasitemia/GUI/GUI.fs
@@ -295,7 +295,32 @@ 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 srcImg -> (srcImg :> Object) = imgCtrl.Tag)))
+
+        // Zoom to a mouse position into the control 'imgCtrl'.
+        let zoomTo (mousePos: Point) =
+            let canvasW = canvasCurrentImage.ActualWidth * currentScale
+            let canvasH = canvasCurrentImage.ActualHeight * currentScale
+            let centerX = (mousePos.X - imgCtrl.BorderThickness.Left) / (imgCtrl.ActualWidth - imgCtrl.BorderThickness.Left) * canvasW
+            let centerY = (mousePos.Y - imgCtrl.BorderThickness.Top) / (imgCtrl.ActualHeight - imgCtrl.BorderThickness.Top) * canvasH
+            scrollViewCurrentImage.ScrollToHorizontalOffset(centerX - scrollViewCurrentImage.ViewportWidth / 2. + borderCurrentImage.BorderThickness.Left)
+            scrollViewCurrentImage.ScrollToVerticalOffset(centerY - scrollViewCurrentImage.ViewportHeight / 2. + borderCurrentImage.BorderThickness.Top)
+
+        imgCtrl.MouseLeftButtonDown.AddHandler(fun obj args ->
+            setCurrentImage (state.SourceImages |> Seq.find (fun srcImg -> (srcImg :> Object) = imgCtrl.Tag))
+            imgCtrl.UpdateLayout()
+            zoomTo (args.GetPosition(imgCtrl))
+            imgCtrl.CaptureMouse() |> ignore)
+
+        imgCtrl.MouseMove.AddHandler(fun obj args ->
+            if imgCtrl.IsMouseCaptured
+            then
+                zoomTo (args.GetPosition(imgCtrl)))
+
+        imgCtrl.MouseLeftButtonUp.AddHandler(fun obj args ->
+            if imgCtrl.IsMouseCaptured
+            then
+                imgCtrl.ReleaseMouseCapture())
+
 
     let updatePreviews () =
         stackPreviews.Children.Clear ()