Merge

4 files changed, 19 insertions, 4 deletions

diff --git a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/MainWindow.xaml b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/MainWindow.xaml
index 875072faa..41ecbb552 100644
--- a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/MainWindow.xaml
+++ b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/MainWindow.xaml
@@ -9,7 +9,7 @@
         xmlns:local="clr-namespace:Tango.MachineEM.UI"
         xmlns:views="clr-namespace:Tango.MachineEM.UI.Views"
         mc:Ignorable="d"
-        Title="Firmware Emulator" Height="820" Width="1300" TitleCaps="False" BorderBrush="Gray" BorderThickness="1" WindowStartupLocation="CenterScreen" Background="#202020" Foreground="Gainsboro" DataContext="{Binding RelativeSource={RelativeSource Self}}">
+        Title="Firmware Emulator" Height="950" Width="1400" TitleCaps="False" BorderBrush="Gray" BorderThickness="1" WindowStartupLocation="CenterScreen" Background="#202020" Foreground="Gainsboro" DataContext="{Binding RelativeSource={RelativeSource Self}}">
     <Grid>
         <views:MainView DataContext="{StaticResource MainViewVM}"></views:MainView>
     </Grid>
diff --git a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Tango.MachineEM.UI.csproj b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Tango.MachineEM.UI.csproj
index c6f382afe..07e03cfd4 100644
--- a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Tango.MachineEM.UI.csproj
+++ b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Tango.MachineEM.UI.csproj
@@ -204,11 +204,12 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>$(TargetDir)linkgen.exe -s "$(TargetPath)" -d "$(SolutionDir)Build\Shortcuts\Machine Emulator.lnk"</PostBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/ViewModels/MainViewVM.cs
index 6b97bae31..7d74b5d04 100644
--- a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/ViewModels/MainViewVM.cs
@@ -148,6 +148,7 @@ namespace Tango.MachineEM.UI.ViewModels
 
         public RelayCommand RequestWasteReplaceCommand { get; set; }
 
+        public RelayCommand FailJobCommand { get; set; }
         #endregion
 
         #region Constructors
@@ -182,6 +183,7 @@ namespace Tango.MachineEM.UI.ViewModels
             FinalizeThreadLoadingCommand = new RelayCommand(FinalizeThreadLoading, (x) => Emulator.IsStarted && _isThreadLoading);
             AbortJobCommand = new RelayCommand(() => Emulator?.AbortJob(), (x) => Emulator.IsStarted);
             RequestWasteReplaceCommand = new RelayCommand(RequestWasteReplace, (x) => Emulator.IsStarted);
+            FailJobCommand = new RelayCommand(FailJob, () => Emulator.IsStarted);
 
             Ports = new List<string>()
             {
@@ -376,6 +378,11 @@ namespace Tango.MachineEM.UI.ViewModels
             catch { }
         }
 
+        private void FailJob()
+        {
+            Emulator.FailJobWithEvent();
+        }
+
         #endregion
 
         #region Private Methods
diff --git a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Views/MainView.xaml b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Views/MainView.xaml
index 98e70d6a5..cc49b0ccd 100644
--- a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Views/MainView.xaml
+++ b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Views/MainView.xaml
@@ -14,7 +14,7 @@
              xmlns:localConverters="clr-namespace:Tango.MachineEM.UI.Converters"
              xmlns:local="clr-namespace:Tango.MachineEM.UI.Views"
              mc:Ignorable="d" 
-             d:DesignHeight="780" d:DesignWidth="1300" Foreground="Gainsboro" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" >
+             d:DesignHeight="900" d:DesignWidth="1400" Foreground="Gainsboro" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" >
 
     <UserControl.Resources>
         <converters:BooleanInverseConverter x:Key="BooleanInverseConverter"></converters:BooleanInverseConverter>
@@ -182,6 +182,13 @@
                                         <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" HorizontalAlignment="Center">PUT DATA STORE ITEM</TextBlock>
                                     </DockPanel>
                                 </Button>
+
+                                <Button HorizontalContentAlignment="Left" Padding="10 0 0 0" Margin="5" Height="45" Style="{StaticResource AccentedSquareButtonStyle}" mahapps:ButtonHelper.PreserveTextCase="True" BorderThickness="0" Command="{Binding FailJobCommand}">
+                                    <DockPanel>
+                                        <fa:ImageAwesome Icon="HandStopOutline" Width="16"></fa:ImageAwesome>
+                                        <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" HorizontalAlignment="Center">FAIL JOB</TextBlock>
+                                    </DockPanel>
+                                </Button>
                                 <!--BUTTONS HERE-->
 
                                 <DockPanel Margin="5 20 5 0">