X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=Parasitemia%2FParasitemiaUI%2FGUI.fs;h=0832a41985e18ae1563368303343597b32f65b5c;hb=refs%2Fheads%2Fmaster;hp=c85017fa1fd581c1eb9ae369f52c6597fffeaedc;hpb=5d1a08f1b121d660228b08d9f931edaed619fdb9;p=master-thesis.git

diff --git a/Parasitemia/ParasitemiaUI/GUI.fs b/Parasitemia/ParasitemiaUI/GUI.fs
index c85017f..0832a41 100644
--- a/Parasitemia/ParasitemiaUI/GUI.fs
+++ b/Parasitemia/ParasitemiaUI/GUI.fs
@@ -18,6 +18,7 @@ open Types
 let run (defaultConfig : Config) (fileToOpen : string option) =
     let app = new Application ()
     let win = MainWindow ()
+    win.Title <- Constants.APPLICATION_NAME
 
     let state = State.State defaultConfig
     let mutable currentScale = 1.
@@ -82,16 +83,23 @@ let run (defaultConfig : Config) (fileToOpen : string option) =
         statusMessageTimer.Start ()
 
     let highlightRBC (rbc : RBC) (highlight : bool) =
-        let strokeThickness = frameStrokeThickness ()
+        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. * 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.
+                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)
@@ -394,6 +402,9 @@ let run (defaultConfig : Config) (fileToOpen : string option) =
         updateDocumentStatus ()
 
     let loadFile (filepath : string) =
+        let displayLoadingErrorMessage (message : string) =
+            MessageBox.Show (sprintf "The document cannot be loaded from \"%s\": %s" filepath message, "Error loading the document", MessageBoxButton.OK, MessageBoxImage.Error) |> ignore
+
         askSaveCurrent ()
         let previousFilePath = state.FilePath
         try
@@ -401,10 +412,14 @@ let run (defaultConfig : Config) (fileToOpen : string option) =
             state.Load ()
             updateGUI ()
         with
+        | PiaZ.VersionFileNewerException fileVersion ->
+            state.FilePath <- previousFilePath
+            displayLoadingErrorMessage $"File version ({fileVersion}) is newer than supported one ({PiaZ.CURRENT_FILE_VERSION}), you may update Parasitemia to the latest version"
+
         | :? IOException as ex ->
             Log.Error "%O" ex
             state.FilePath <- previousFilePath
-            MessageBox.Show (sprintf "The document cannot be loaded from \"%s\"" filepath, "Error loading the document", MessageBoxButton.OK, MessageBoxImage.Error) |> ignore
+            displayLoadingErrorMessage "IO Error"
 
     let askLoadFile () =
         let dialog = OpenFileDialog (Filter = PiaZ.filter)
@@ -436,7 +451,7 @@ let run (defaultConfig : Config) (fileToOpen : string option) =
                 MessageBox.Show (sprintf "The results cannot be exported in \"%s\"" state.FilePath, "Error exporting the files", MessageBoxButton.OK, MessageBoxImage.Error) |> ignore
 
     let importImage () =
-        let dialog = OpenFileDialog (Filter = "Image Files|*.png;*.jpg;*.tif;*.tiff", Multiselect = true)
+        let dialog = OpenFileDialog (Filter = "Image Files|*.png;*.jpg;.jpeg;.bmp;*.tif;*.tiff", Multiselect = true)
         let res = dialog.ShowDialog ()
         if res.HasValue && res.Value then
             let noSourceImage = state.SourceImages.Count () = 0
@@ -583,7 +598,7 @@ let run (defaultConfig : Config) (fileToOpen : string option) =
     // 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
@@ -591,7 +606,7 @@ let run (defaultConfig : Config) (fileToOpen : string option) =
     // 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
@@ -599,7 +614,7 @@ let run (defaultConfig : Config) (fileToOpen : string option) =
     // 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
@@ -607,7 +622,7 @@ let run (defaultConfig : Config) (fileToOpen : string option) =
     // 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
@@ -615,7 +630,7 @@ let run (defaultConfig : Config) (fileToOpen : string option) =
     // 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
@@ -623,7 +638,7 @@ let run (defaultConfig : Config) (fileToOpen : string option) =
     // 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
@@ -631,7 +646,7 @@ let run (defaultConfig : Config) (fileToOpen : string option) =
     // 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
@@ -639,7 +654,7 @@ let run (defaultConfig : Config) (fileToOpen : string option) =
     // Toggle RBC highlight.
     win.InputBindings.Add (
         Input.KeyBinding (
-            ViewModule.FunCommand (
+            Utils.FunCommand (
                 (
                     fun obj ->
                         win.menuHightlightRBC.IsChecked <- not win.menuHightlightRBC.IsChecked