From aaa250fab2ac3227bf45704355d389bc1a4ee7fc Mon Sep 17 00:00:00 2001 From: Greg Burri Date: Fri, 15 Jan 2016 11:39:42 +0100 Subject: [PATCH] Set an application icon. --- Parasitemia/Parasitemia/Config.fs | 2 +- Parasitemia/Parasitemia/GUI/Analysis.fs | 4 ++-- .../Parasitemia/GUI/ImageSourceSelection.xaml | 4 ++-- Parasitemia/Parasitemia/GUI/MainWindow.xaml | 2 +- Parasitemia/Parasitemia/GUI/PiaZ.fs | 7 +++++-- Parasitemia/Parasitemia/Parasitemia.fsproj | 3 ++- Parasitemia/Parasitemia/Resources/icon.ico | Bin 0 -> 124283 bytes Parasitemia/Parasitemia/Resources/logo_256.png | Bin 34510 -> 0 bytes Parasitemia/Parasitemia/resources.rc | 1 + Parasitemia/Parasitemia/resources.res | Bin 0 -> 124532 bytes 10 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 Parasitemia/Parasitemia/Resources/icon.ico delete mode 100644 Parasitemia/Parasitemia/Resources/logo_256.png create mode 100644 Parasitemia/Parasitemia/resources.rc create mode 100644 Parasitemia/Parasitemia/resources.res diff --git a/Parasitemia/Parasitemia/Config.fs b/Parasitemia/Parasitemia/Config.fs index 0916408..cd8f659 100644 --- a/Parasitemia/Parasitemia/Config.fs +++ b/Parasitemia/Parasitemia/Config.fs @@ -42,7 +42,7 @@ type Parameters = { let defaultParameters = { rbcDiameter = 8.<μm> - resolution = 200.e3 // Correspond to 50X. + resolution = 220.e3 // Correspond to 50X. ratioAreaPaleCenter = 1.f / 3.f // The ratio between an RBC area and the area of the its pale center. diff --git a/Parasitemia/Parasitemia/GUI/Analysis.fs b/Parasitemia/Parasitemia/GUI/Analysis.fs index 6ae1e20..0c79d79 100644 --- a/Parasitemia/Parasitemia/GUI/Analysis.fs +++ b/Parasitemia/Parasitemia/GUI/Analysis.fs @@ -70,8 +70,8 @@ let showWindow (parent: Window) (state: State.State) : bool = imageSourceSelection.lblDateLastAnalysis.Content <- if srcImg.dateLastAnalysis.Ticks = 0L then "" else srcImg.dateLastAnalysis.ToString() imageSourceSelection.txtResolution.Text <- srcImg.config.Parameters.resolution.ToString() - imageSourceSelection.menuZoom50X.Click.AddHandler(fun obj args -> imageSourceSelection.txtResolution.Text <- "200000"; updateResolution ()) - imageSourceSelection.menuZoom100X.Click.AddHandler(fun obj args -> imageSourceSelection.txtResolution.Text <- "400000"; updateResolution ()) + imageSourceSelection.menuZoom50X.Click.AddHandler(fun obj args -> imageSourceSelection.txtResolution.Text <- "230000"; updateResolution ()) + imageSourceSelection.menuZoom100X.Click.AddHandler(fun obj args -> imageSourceSelection.txtResolution.Text <- "460000"; updateResolution ()) imageSourceSelection.txtResolution.PreviewTextInput.AddHandler(fun obj args -> let text = imageSourceSelection.txtResolution.Text + args.Text diff --git a/Parasitemia/Parasitemia/GUI/ImageSourceSelection.xaml b/Parasitemia/Parasitemia/GUI/ImageSourceSelection.xaml index 4fcde66..62a97f5 100644 --- a/Parasitemia/Parasitemia/GUI/ImageSourceSelection.xaml +++ b/Parasitemia/Parasitemia/GUI/ImageSourceSelection.xaml @@ -44,8 +44,8 @@