X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemia%2FGUI%2FGUI.fs;h=155c1d1e17ad2cdc0eeaf27dd2f5b97efea8f6d0;hp=cf7ed67a2f70ccc1353a7ec2163f8ccd62ec45b6;hb=da6b1ee15d0368ef9f2d9734b0d72996cbc227d8;hpb=3ddaf64dc5ba6a7066a279ad75b9a1ee72194639

diff --git a/Parasitemia/Parasitemia/GUI/GUI.fs b/Parasitemia/Parasitemia/GUI/GUI.fs
index cf7ed67..155c1d1 100644
--- a/Parasitemia/Parasitemia/GUI/GUI.fs
+++ b/Parasitemia/Parasitemia/GUI/GUI.fs
@@ -10,8 +10,8 @@ open System.Drawing
 open System.Diagnostics
 open Microsoft.Win32 // For the common dialogs.
 
-open Emgu.CV
-open Emgu.CV.Structure
+//open Emgu.CV
+//open Emgu.CV.Structure
 open Emgu.CV.WPF
 
 open Config
@@ -26,21 +26,38 @@ let run (defaultConfig: Config) =
 
     let state = State.State()
 
-    let exit: Controls.MenuItem = ctrl "menuExit"
-    let save: Controls.MenuItem = ctrl "menuSave"
-    let load: Controls.MenuItem = ctrl "menuOpen"
+    let exit: MenuItem = ctrl "menuExit"
+    let saveFile: MenuItem = ctrl "menuSave"
+    let loadFile: MenuItem = ctrl "menuOpen"
+    let newFile: MenuItem = ctrl "menuNew"
 
-    let txtPatient: Controls.TextBox = ctrl "txtPatient"
+    let addSourceImage: MenuItem = ctrl "menuAddSourceImage"
 
+    let txtPatient: TextBox = ctrl "txtPatient"
+
+    let stackPreviews: StackPanel = ctrl "stackPreviews"
+
+    let butStartAnalysis: Button = ctrl "butStartAnalysis"
 
     let synchronizeState () =
         state.PatientID <- txtPatient.Text
 
-    let synchronizeView () =
+    let updatePreviews () =
+        stackPreviews.Children.Clear ()
+        state.ImagesSource |> Seq.iteri (fun i imgSrc ->
+            let imgCtrl = Views.ImageSourcePreview(Margin = Thickness(3.))
+            imgCtrl.lblImageNumber.Content <- i + 1
+            let width = 200
+            let height = imgSrc.img.Height * width / imgSrc.img.Width
+            imgCtrl.imagePreview.Source <- BitmapSourceConvert.ToBitmapSource(imgSrc.img.Resize(width, height, Emgu.CV.CvEnum.Inter.Cubic))
+            stackPreviews.Children.Add(imgCtrl) |> ignore )
+
+    let updateGUI () =
         txtPatient.Text <- state.PatientID
+        updatePreviews ()
 
     exit.Click.AddHandler(fun obj args -> mainWindow.Root.Close())
-    save.Click.AddHandler(fun obj args ->
+    saveFile.Click.AddHandler(fun obj args ->
         synchronizeState ()
         if state.FilePath = ""
         then
@@ -53,7 +70,7 @@ let run (defaultConfig: Config) =
         else
             state.Save())
 
-    load.Click.AddHandler(fun obj args ->
+    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 res = dialog.ShowDialog()
@@ -61,7 +78,22 @@ let run (defaultConfig: Config) =
         then
             state.FilePath <- dialog.FileName
             state.Load()
-            synchronizeView ())
+            updateGUI ())
+
+    newFile.Click.AddHandler(fun obj args ->
+        // TODO: if current state not saved and not empty, ask to save it.
+        state.Reset()
+        updateGUI())
+
+    addSourceImage.Click.AddHandler(fun obj args ->
+        let dialog = OpenFileDialog(Filter = "Image Files|*.png;*.jpg;*.tif;*.tiff")
+        let res = dialog.ShowDialog()
+        if res.HasValue && res.Value
+        then
+            state.AddSourceImage(dialog.FileName)
+            updatePreviews ())
+
+    butStartAnalysis.Click.AddHandler(fun obj args -> ())
 
     (*let txtPatient: Controls.TextBox = ctrl "txtPatient"
     txtPatient.TextChanged.AddHandler(fun obj args ->