Merge pull request #2 from TheSwerik/SaveResults

Save results & Cleanup UI
TheSwerik · May 8, 2020 · 67e6ec0 · 67e6ec0
2 parents a12043c + 9585e67
commit 67e6ec0
Show file tree

Hide file tree

Showing 9 changed files with 86 additions and 11 deletions.
diff --git a/Inno Config.iss b/Inno Config.iss
@@ -1,6 +1,6 @@
 ; Variables:
 #define MyAppName "RedEye"
-#define MyAppVersion "1.2.0"
+#define MyAppVersion "1.3.0"
 #define MyAppPublisher "Swerik"
 #define MyAppURL "https://github.com/TheSwerik/RedEye"   
 #define MyAppExeName "RedEye.exe"

diff --git a/RedEye.Backend/src/Util/Config.cs b/RedEye.Backend/src/Util/Config.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using Emgu.CV.Cuda;
 using Microsoft.VisualBasic.FileIO;
 
@@ -23,6 +24,10 @@ static Config()
             }
 
             IsCudaEnabled = GetBool("Cuda") && CudaInvoke.HasCuda;
+
+            if (Get("ScreenshotLocation").ToLowerInvariant().Contains("default"))
+                Set("ScreenshotLocation", Environment.GetFolderPath(Environment.SpecialFolder.MyPictures) + @"\RedEye Screenshots");
+            Directory.CreateDirectory(Get("ScreenshotLocation"));
         }
 
         public static void Set(string setting, string value)

diff --git a/RedEye.UI/RedEye.UI.csproj b/RedEye.UI/RedEye.UI.csproj
@@ -10,6 +10,7 @@
         <LangVersion>8</LangVersion>
         <Nullable>enable</Nullable>
         <AssemblyName>RedEye</AssemblyName>
+        <ProjectGuid>{C3591D81-347D-4F3E-B3F2-7FD71441E0CA}</ProjectGuid>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/RedEye.UI/src/App.xaml b/RedEye.UI/src/App.xaml
@@ -2,8 +2,9 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:RedEye"
-             StartupUri="src/MainWindow.xaml">
+             StartupUri="MainWindow.xaml">
     <Application.Resources>
 
+        <local:BoolToGridRowHeightConverter x:Key="BoolToGridRowHeightConverter" />
     </Application.Resources>
 </Application>
diff --git a/RedEye.UI/src/BoolToGridRowHeightConverter.cs b/RedEye.UI/src/BoolToGridRowHeightConverter.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace RedEye
+{
+    [ValueConversion(typeof(bool), typeof(GridLength))]
+    public class BoolToGridRowHeightConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return ((bool)value == true) ? new GridLength(1, GridUnitType.Star) : new GridLength(0);
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {    // Don't need any convert back
+            return null!;
+        }
+    }
+}
diff --git a/RedEye.UI/src/MainWindow.xaml b/RedEye.UI/src/MainWindow.xaml
@@ -5,7 +5,8 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:RedEye"
         mc:Ignorable="d"
-        Title="MainWindow" Height="450" Width="800" Closed="Window_OnClosed" SizeChanged="Window_OnSizeChanged">
+        Title="RedEye" Height="450" Width="800" Closed="Window_OnClosed" SizeChanged="Window_OnSizeChanged"
+        d:DataContext="{d:DesignInstance }">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*" />
@@ -15,8 +16,9 @@
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />
             <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto"  x:Name="DeviceComboRow" />
             <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" x:Name="NextButtonRow" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="1.25*" />
         </Grid.RowDefinitions>
@@ -31,14 +33,17 @@
             <RadioButton Grid.Column="2" Content="Camera" x:Name="RadioButtonCam" Checked="RadioButtonCamera_OnChecked" />
         </Grid>
 
-        <ComboBox Grid.Column="1" Grid.Row="2" Text="Device:" x:Name="DeviceBox" SelectionChanged="DeviceBox_OnSelectionChanged" />
+        <ComboBox Grid.Column="1" Grid.Row="2" Text="Device:" x:Name="DeviceBox"
+                  SelectionChanged="DeviceBox_OnSelectionChanged" />
 
-        <Canvas Grid.Column="1" Grid.Row="3" x:Name="MainCanvas" IsHitTestVisible="False"
-                Width="{Binding ActualWidth, ElementName=Pic, Mode=OneWay}" ClipToBounds="True">
+        <Canvas Grid.Column="1" Grid.Row="3" x:Name="MainCanvas" IsHitTestVisible="False" ClipToBounds="True"
+                Width="{Binding ActualWidth, ElementName=Pic, Mode=OneWay}">
             <Image x:Name="Pic" RenderOptions.BitmapScalingMode="Fant"
                    Height="{Binding ActualHeight, ElementName=MainCanvas, Mode=OneWay}" />
         </Canvas>
 
         <Button Grid.Column="1" Grid.Row="4" Content="Next" x:Name="NextButton" Click="NextButton_OnClick" />
+
+        <Button Grid.Column="1" Grid.Row="5" Content="Save" x:Name="SaveButton" Click="SaveButton_OnClick" />
     </Grid>
 </Window>
diff --git a/RedEye.UI/src/MainWindow.xaml.cs b/RedEye.UI/src/MainWindow.xaml.cs
@@ -1,8 +1,11 @@
 using System;
 using System.Globalization;
+using System.IO;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
 using System.Windows.Threading;
 using Emgu.CV;
 using Emgu.CV.Cuda;
@@ -59,6 +62,8 @@ private void RadioButtonCamera_OnChecked(object sender, RoutedEventArgs e)
             DeviceBox_OnSelectionChanged(null, null);
             NextButton.Visibility = Visibility.Hidden;
             DeviceBox.Visibility = Visibility.Visible;
+            NextButtonRow.Height = new GridLength(0);
+            DeviceComboRow.Height = GridLength.Auto;
         }
 
         private void DeviceBox_OnSelectionChanged(object? sender, SelectionChangedEventArgs? e)
@@ -81,6 +86,8 @@ private void Window_OnSizeChanged(object sender, SizeChangedEventArgs e)
             );
         }
 
+        private void SaveButton_OnClick(object sender, RoutedEventArgs e) => Dispatcher.BeginInvoke((Action) SavePNG, DispatcherPriority.ContextIdle);
+
         // Helper Methods:
         private void ClearCanvas()
         {
@@ -130,12 +137,46 @@ private void SwitchToImage()
             NextButton_OnClick(null, null);
             NextButton.Visibility = Visibility.Visible;
             DeviceBox.Visibility = Visibility.Hidden;
+            DeviceComboRow.Height = new GridLength(0);
+            NextButtonRow.Height = GridLength.Auto;
         }
 
         private void DetectAsync()
         {
             if (!Config.IsCudaEnabled) DrawDetection(new Mat(_images.CurrentImagePath()).ToImage<Gray, byte>());
             else DrawDetection(new GpuMat(new Mat(_images.CurrentImagePath()).ToImage<Gray, byte>()));
         }
+
+        private void SavePNG()
+        {
+            var bounds = VisualTreeHelper.GetDescendantBounds(MainCanvas);
+            var rtb = new RenderTargetBitmap((int) bounds.Width, (int) bounds.Height, 96d, 96d, PixelFormats.Default);
+
+            DrawingVisual dv = new DrawingVisual();
+            using (DrawingContext dc = dv.RenderOpen())
+            {
+                VisualBrush vb = new VisualBrush(MainCanvas);
+                dc.DrawRectangle(vb, null, new Rect(new Point(), bounds.Size));
+            }
+
+            rtb.Render(dv);
+            var pngEncoder = new PngBitmapEncoder();
+            pngEncoder.Frames.Add(BitmapFrame.Create(rtb));
+
+            try
+            {
+                var ms = new MemoryStream();
+                pngEncoder.Save(ms);
+                ms.Close();
+                File.WriteAllBytes(
+                    Config.Get("ScreenshotLocation") + $@"\RedEye {DateTime.Now:yyyy-MM-dd hh-mm-ss}.png",
+                    ms.ToArray());
+            }
+            catch (Exception err)
+            {
+                const string message = "Failed to Save Image:\n";
+                MessageBox.Show(message + err.ToString(), "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
     }
 }
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,5 +1,5 @@
 environment:
-  my_version_number: 1.2.0         # DONT FORGET TO CHANGE IS IN THE ISS FILE
+  my_version_number: 1.3.0         # DONT FORGET TO CHANGE IS IN THE ISS FILE
   application_name: RedEye         # DONT FORGET TO CHANGE IS IN THE ISS FILE
   project_name: RedEye.UI
 

diff --git a/assets/config.csv b/assets/config.csv
@@ -1,7 +1,8 @@
 StartWithCamera: true
-EyeImageVerticalOffset: 2
+EyeImageVerticalOffset: 4
 DetectionFrequency: 20
+Neighbors: 2
 PickAverage: false
-Cuda: false
 DrawRectangles: false
-Neighbors: 1
+Cuda: false
+ScreenshotLocation: default