Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

14 files changed, 490 insertions, 68 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/App.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/App.xaml
new file mode 100644
index 000000000..dff08b5e8
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/App.xaml
@@ -0,0 +1,12 @@
+<Application x:Class="Tango.MachineStudio.Developer.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="pack://application:,,,/Tango.MachineStudio.Common;component/Resources/MaterialDesign.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/Tango.MachineStudio.Common;component/Themes/LightThemeColors.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModuleSettings.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModuleSettings.cs
index 3d0ee2461..ce2c02fe7 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModuleSettings.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModuleSettings.cs
@@ -44,6 +44,8 @@ namespace Tango.MachineStudio.Developer
             set { _usePreferredLiquidVolumeIndex = value;  RaisePropertyChangedAuto(); }
         }
 
+        public bool AutoProcessSelection { get; set; }
+
         public DeveloperModuleSettings()
         {
             ProcessParametersIndices = new List<ParameterIndex>();
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
index 6e55b6d14..012ed8d0d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
@@ -52,6 +52,15 @@
     <Reference Include="MaterialDesignThemes.Wpf, Version=2.3.1.953, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\MaterialDesignThemes.2.3.1.953\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.WindowsAPICodePack, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.WindowsAPICodePack-Core.1.1.0.0\lib\Microsoft.WindowsAPICodePack.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.WindowsAPICodePack.Shell, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.WindowsAPICodePack-Shell.1.1.0.0\lib\Microsoft.WindowsAPICodePack.Shell.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.WindowsAPICodePack.ShellExtensions, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.WindowsAPICodePack-Shell.1.1.0.0\lib\Microsoft.WindowsAPICodePack.ShellExtensions.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Data" />
@@ -121,6 +130,7 @@
     <Compile Include="ViewModelLocator.cs" />
     <Compile Include="ViewModels\EmbroideryDisplayViewVM.cs" />
     <Compile Include="ViewModels\EmbroideryImportViewVM.cs" />
+    <Compile Include="ViewModels\InsufficientLiquidQuantityViewVM.cs" />
     <Compile Include="ViewModels\MainViewVM.cs" />
     <Compile Include="Views\EmbroideryDisplayView.xaml.cs">
       <DependentUpon>EmbroideryDisplayView.xaml</DependentUpon>
@@ -128,6 +138,9 @@
     <Compile Include="Views\EmbroideryImportView.xaml.cs">
       <DependentUpon>EmbroideryImportView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\InsufficientLiquidQuantityView.xaml.cs">
+      <DependentUpon>InsufficientLiquidQuantityView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\MainView.xaml.cs">
       <DependentUpon>MainView.xaml</DependentUpon>
     </Compile>
@@ -141,6 +154,10 @@
     <Compile Include="Views\RunningJobView.xaml.cs">
       <DependentUpon>RunningJobView.xaml</DependentUpon>
     </Compile>
+    <Page Include="App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\EmbroideryDisplayView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -149,6 +166,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\InsufficientLiquidQuantityView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\MainView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -184,8 +205,12 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <None Include="app.config" />
-    <None Include="packages.config" />
+    <None Include="app.config">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -361,7 +386,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/InsufficientLiquidQuantityViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/InsufficientLiquidQuantityViewVM.cs
new file mode 100644
index 000000000..e18fc842f
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/InsufficientLiquidQuantityViewVM.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Integration.Operation;
+using Tango.SharedUI;
+
+namespace Tango.MachineStudio.Developer.ViewModels
+{
+    public class InsufficientLiquidQuantityViewVM : DialogViewVM
+    {
+        public InsufficientLiquidQuantityException Exception { get; set; }
+
+        public InsufficientLiquidQuantityViewVM(InsufficientLiquidQuantityException ex)
+        {
+            Exception = ex;
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index ac5354a74..27d43bd20 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -48,6 +48,8 @@ using Tango.MachineStudio.Common.Navigation;
 using System.Diagnostics;
 using Tango.Core.ExtensionMethods;
 using Tango.ColorConversion;
+using Tango.PMR.Exports;
+using Microsoft.WindowsAPICodePack.Dialogs;
 
 namespace Tango.MachineStudio.Developer.ViewModels
 {
@@ -552,14 +554,35 @@ namespace Tango.MachineStudio.Developer.ViewModels
             set { _enableColorConversion = value; RaisePropertyChangedAuto(); }
         }
 
+        /// <summary>
+        /// Gets or sets the authentication provider.
+        /// </summary>
         public IAuthenticationProvider AuthenticationProvider { get; set; }
 
+        /// <summary>
+        /// Gets or sets the module settings.
+        /// </summary>
         public DeveloperModuleSettings Settings
         {
             get { return _settings; }
             set { _settings = value; RaisePropertyChangedAuto(); }
         }
 
+        private bool _autoProcessSelection;
+        /// <summary>
+        /// Gets or sets a value indicating whether [automatic process selection].
+        /// </summary>
+        public bool AutoProcessSelection
+        {
+            get { return _autoProcessSelection; }
+            set
+            {
+                _autoProcessSelection = value;
+                RaisePropertyChangedAuto();
+                Settings.AutoProcessSelection = _autoProcessSelection;
+            }
+        }
+
         #endregion
 
         #region Commands
@@ -704,6 +727,16 @@ namespace Tango.MachineStudio.Developer.ViewModels
         /// </summary>
         public RelayCommand ResetProcessParametersCommand { get; set; }
 
+        /// <summary>
+        /// Gets or sets the import job file command.
+        /// </summary>
+        public RelayCommand ImportJobFileCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets the export job file command.
+        /// </summary>
+        public RelayCommand ExportJobFileCommand { get; set; }
+
         #endregion
 
         #region Constructors
@@ -765,6 +798,8 @@ namespace Tango.MachineStudio.Developer.ViewModels
             DisplayJobEmbroideryFileCommand = new RelayCommand<Job>(DisplayJobEmbroideryFile, () => CanWork);
             ReloadMachinesCommand = new RelayCommand(() => LoadMachine(), () => CanWork && SelectedMachine != null);
             ResetProcessParametersCommand = new RelayCommand(ResetProcessParameters, () => CanWork && MachineOperator != null);
+            ImportJobFileCommand = new RelayCommand(ImportJobFile, () => SelectedMachine != null && CanWork);
+            ExportJobFileCommand = new RelayCommand(ExportJobFile, () => SelectedMachine != null && SelectedMachineJob != null && CanWork);
 
             ApplicationManager.ConnectedMachineChanged += ApplicationManager_ConnectedMachineChanged;
 
@@ -795,6 +830,8 @@ namespace Tango.MachineStudio.Developer.ViewModels
         {
             Settings = SettingsManager.Default.GetOrCreate<DeveloperModuleSettings>();
 
+            AutoProcessSelection = Settings.AutoProcessSelection;
+
             SelectedJobs = new ObservableCollection<Job>();
             JobEvents = new ObservableCollection<MachinesEvent>();
 
@@ -827,7 +864,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
         {
             while (true)
             {
-                if (!_rml_has_no_cct && EnableColorConversion && !_disable_gamut_check && IsJobVisible && IsVisible && ActiveJob != null && ActiveJob.Segments != null)
+                if (!_rml_has_no_cct && EnableColorConversion && !_disable_gamut_check && IsJobVisible && IsVisible && ActiveJob != null && ActiveJob.Segments != null && SelectedProcessParametersTable != null)
                 {
                     try
                     {
@@ -839,7 +876,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                             {
                                 try
                                 {
-                                    var output = _converter.Convert(stop);
+                                    var output = _converter.Convert(stop, false);
 
                                     stop.Red = output.SingleCoordinates.Red;
                                     stop.Green = output.SingleCoordinates.Green;
@@ -853,7 +890,8 @@ namespace Tango.MachineStudio.Developer.ViewModels
                             {
                                 try
                                 {
-                                    stop.IsOutOfGamut = _converter.IsOutOfGamut(stop);
+                                    var output = _converter.Convert(stop, false);
+                                    output.ApplyOnBrushStopLiquidVolumes(stop, SelectedProcessParametersTable);
                                     stop.OutOfGamutChecked = true;
                                 }
                                 catch { }
@@ -863,6 +901,23 @@ namespace Tango.MachineStudio.Developer.ViewModels
                     catch { }
                 }
 
+                if (AutoProcessSelection && IsJobVisible && IsVisible && ActiveJob != null && ActiveJob.Segments != null && !_rml_has_no_cct && !_disable_gamut_check)
+                {
+                    try
+                    {
+                        var recommendedProcess = _converter.GetRecommendedProcessParameters(ActiveJob, RmlProcessParametersTableGroup);
+
+                        if (recommendedProcess != null && recommendedProcess != SelectedProcessParametersTable)
+                        {
+                            SelectedProcessParametersTable = recommendedProcess;
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        LogManager.Log(ex, "Error resolving recommended process parameters.");
+                    }
+                }
+
                 Thread.Sleep(500);
             }
         }
@@ -874,7 +929,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 _hiveOpened = true;
                 try
                 {
-                    HiveSuggestions = _converter.Convert(SelectedBrushStop).CreateHiveSuggestions();
+                    HiveSuggestions = _converter.Convert(SelectedBrushStop, true).CreateHiveSuggestions();
                 }
                 catch (Exception ex)
                 {
@@ -915,7 +970,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
             if (!_color_changed_from_hive && _hiveOpened)
             {
                 SelectedBrushStop.Corrected = false;
-                HiveSuggestions = _converter.Convert(SelectedBrushStop).CreateHiveSuggestions();
+                HiveSuggestions = _converter.Convert(SelectedBrushStop, true).CreateHiveSuggestions();
             }
         }
 
@@ -1337,6 +1392,26 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 stop.SetLiquidVolumes(SelectedMachine.Configuration, SelectedRML, SelectedProcessParametersTable);
             }
 
+            if (AutoProcessSelection)
+            {
+                LogManager.Log("Auto process parameters selection enabled. Trying to resolve the recommended process parameters...");
+                try
+                {
+                    var recommendedProcess = _converter.GetRecommendedProcessParameters(ActiveJob, RmlProcessParametersTableGroup);
+
+                    if (recommendedProcess != null && recommendedProcess != SelectedProcessParametersTable)
+                    {
+                        SelectedProcessParametersTable = recommendedProcess;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogManager.Log(ex, "Error resolving recommended process parameters.");
+                    _notification.ShowError("An error occurred while trying to resolve the recommended process parameters.Please try to disable the auto selection.");
+                    return;
+                }
+            }
+
             JobEvents.Clear();
             IsJobFailed = false;
             IsJobCanceled = false;
@@ -1445,6 +1520,16 @@ namespace Tango.MachineStudio.Developer.ViewModels
                     //Finally Canceled..
                 };
             }
+            catch (InsufficientLiquidQuantityException ex)
+            {
+                _notification.ShowModalDialog<InsufficientLiquidQuantityViewVM, InsufficientLiquidQuantityView>(new InsufficientLiquidQuantityViewVM(ex), (x) =>
+                {
+
+                    MachineOperator.EnableJobLiquidQuantityValidation = false;
+                    StartJob();
+
+                }, () => { });
+            }
             catch (Exception ex)
             {
                 LogManager.Log(ex);
@@ -2417,6 +2502,112 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
         #endregion
 
+        #region Job Import/Export
+
+        private async void ExportJobFile()
+        {
+            if (SelectedJobs != null && SelectedJobs.Count > 1)
+            {
+                CommonOpenFileDialog dlg = new CommonOpenFileDialog();
+                dlg.Title = "Select a folder to place all job files.";
+                dlg.IsFolderPicker = true;
+
+                if (dlg.ShowDialog() == CommonFileDialogResult.Ok)
+                {
+                    foreach (var job in SelectedJobs)
+                    {
+                        using (_notification.PushTaskItem($"Exporting job '{job.Name}'..."))
+                        {
+                            try
+                            {
+                                LogManager.Log($"Exporting job file {job.Name}");
+
+                                var jobFile = await job.ToJobFile();
+                                File.WriteAllBytes(Path.Combine(dlg.FileName, job.Name + ".job"), jobFile.ToBytes());
+                            }
+                            catch (Exception ex)
+                            {
+                                LogManager.Log(ex, "Error exporting job file.");
+                                _notification.ShowError($"An error occurred while trying to export job '{job.Name}'.\n{ex.FlattenMessage()}");
+                            }
+                        }
+                    }
+                }
+            }
+            else
+            {
+                SaveFileDialog dlg = new SaveFileDialog();
+                dlg.Title = "Export Job File";
+                dlg.Filter = "Twine Job Files|*.job";
+                dlg.DefaultExt = ".job";
+                dlg.FileName = SelectedMachineJob.Name;
+                if (dlg.ShowDialog().Value)
+                {
+                    using (_notification.PushTaskItem($"Exporting job '{SelectedMachineJob.Name}'..."))
+                    {
+                        try
+                        {
+                            LogManager.Log($"Exporting job file {SelectedMachineJob.Name}");
+
+                            var jobFile = await SelectedMachineJob.ToJobFile();
+                            File.WriteAllBytes(dlg.FileName, jobFile.ToBytes());
+                        }
+                        catch (Exception ex)
+                        {
+                            LogManager.Log(ex, "Error exporting job file.");
+                            _notification.ShowError($"An error occurred while trying to export job '{SelectedMachineJob.Name}'.\n{ex.FlattenMessage()}");
+                        }
+                    }
+                }
+            }
+        }
+
+        private async void ImportJobFile()
+        {
+            OpenFileDialog dlg = new OpenFileDialog();
+            dlg.Title = "Import Job File";
+            dlg.Filter = "Twine Job Files|*.job";
+            dlg.Multiselect = true;
+            if (dlg.ShowDialog().Value)
+            {
+                using (_notification.PushTaskItem($"Importing job files..."))
+                {
+                    try
+                    {
+                        IsFree = false;
+
+                        LogManager.Log($"Importing job files...");
+
+                        foreach (var file in dlg.FileNames)
+                        {
+                            var bytes = File.ReadAllBytes(file);
+                            var jobFile = JobFile.Parser.ParseFrom(bytes);
+                            var job = await Job.FromJobFile(jobFile, SelectedMachine.Guid, AuthenticationProvider.CurrentUser.Guid);
+
+                            _machineDbContext.Jobs.Add(job);
+                        }
+
+                        await _machineDbContext.SaveChangesAsync();
+
+                        IsFree = true;
+
+                        _notification.ShowInfo($"Jobs imported successfully.");
+                    }
+                    catch (Exception ex)
+                    {
+                        LogManager.Log(ex, "Error importing job file.");
+                        _notification.ShowError($"An error occurred while trying to import the selected job file.\n{ex.FlattenMessage()}");
+                    }
+                    finally
+                    {
+                        IsFree = true;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
         #region Override Methods
 
         protected override void RaisePropertyChangedAuto([CallerMemberName] string caller = null)
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/EmbroideryDisplayView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/EmbroideryDisplayView.xaml
index 22414b4b2..2e1eaf6a1 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/EmbroideryDisplayView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/EmbroideryDisplayView.xaml
@@ -9,7 +9,7 @@
              xmlns:converters="clr-namespace:Tango.MachineStudio.Developer.Converters"
              xmlns:local="clr-namespace:Tango.MachineStudio.Developer.Views"
              mc:Ignorable="d" 
-             Width="1280" Height="720" Background="White" d:DataContext="{d:DesignInstance Type=vm:EmbroideryDisplayViewVM, IsDesignTimeCreatable=False}">
+             Width="1280" Height="720" Background="{StaticResource WhiteBackgroundBrush}" d:DataContext="{d:DesignInstance Type=vm:EmbroideryDisplayViewVM, IsDesignTimeCreatable=False}">
 
     <UserControl.Resources>
         <converters:ByteArrayToBitmapSourceConverter x:Key="ByteArrayToBitmapSourceConverter" />
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/EmbroideryImportView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/EmbroideryImportView.xaml
index 8d25719e8..d9ff176d9 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/EmbroideryImportView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/EmbroideryImportView.xaml
@@ -10,7 +10,7 @@
              xmlns:brushPicker="clr-namespace:Tango.BrushPicker;assembly=Tango.BrushPicker"
              xmlns:local="clr-namespace:Tango.MachineStudio.Developer.Views"
              mc:Ignorable="d" 
-             Height="720" Width="1280" Background="White" d:DataContext="{d:DesignInstance Type=vm:EmbroideryImportViewVM, IsDesignTimeCreatable=False}">
+             Height="720" Width="1280" Background="{StaticResource WhiteBackgroundBrush}" d:DataContext="{d:DesignInstance Type=vm:EmbroideryImportViewVM, IsDesignTimeCreatable=False}">
     <Grid>
         <Grid>
             <Grid.ColumnDefinitions>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml
new file mode 100644
index 000000000..f0e9dc29c
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml
@@ -0,0 +1,81 @@
+<UserControl x:Class="Tango.MachineStudio.Developer.Views.InsufficientLiquidQuantityView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:vm="clr-namespace:Tango.MachineStudio.Developer.ViewModels"
+             xmlns:local="clr-namespace:Tango.MachineStudio.Developer.Views"
+             mc:Ignorable="d" 
+             Height="450" Width="800" Background="{StaticResource WhiteBackgroundBrush}" d:DataContext="{d:DesignInstance Type=vm:InsufficientLiquidQuantityViewVM, IsDesignTimeCreatable=False}">
+    <Grid Margin="10">
+        <DockPanel>
+            <StackPanel DockPanel.Dock="Top">
+                <TextBlock FontSize="24" Foreground="{StaticResource RedBrush100}">Insufficient Liquid Level</TextBlock>
+                <TextBlock Margin="0 5 0 0" TextWrapping="Wrap" Foreground="{StaticResource GrayBrush}">
+                    <Run>There seems to be an insufficient ink levels in one or more of the following dispensers.</Run>
+                    <LineBreak/>
+                    <Run>The job cannot be completed.</Run>
+                </TextBlock>
+            </StackPanel>
+
+            <Grid DockPanel.Dock="Bottom" Height="60">
+                <Button HorizontalAlignment="Left" DockPanel.Dock="Bottom" Height="40" Width="170" Style="{StaticResource MaterialDesignFlatButton}" BorderBrush="{StaticResource RedBrush300}" Foreground="{StaticResource RedBrush300}" Command="{Binding OKCommand}" ToolTip="Ignore this warning now and in the future">Ignore This Error</Button>
+                <Button HorizontalAlignment="Right" DockPanel.Dock="Bottom" Height="40" Width="140" Command="{Binding CloseCommand}" Margin="10 0 0 0">CLOSE</Button>
+            </Grid>
+
+            <Border Margin="0 40 0 0" BorderThickness="1" BorderBrush="{StaticResource BorderBrushGainsboro}" CornerRadius="3">
+                <ItemsControl ItemsSource="{Binding Exception.IdsPackLevels}">
+                    <ItemsControl.ItemsPanel>
+                        <ItemsPanelTemplate>
+                            <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Orientation="Horizontal" IsItemsHost="True"></StackPanel>
+                        </ItemsPanelTemplate>
+                    </ItemsControl.ItemsPanel>
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <StackPanel Margin="15 0">
+                                <TextBlock HorizontalAlignment="Center" Text="{Binding IdsPack.LiquidType.Name}"></TextBlock>
+                                <Border Margin="0 5 0 0" Height="150" Width="50" CornerRadius="3" BorderThickness="1" BorderBrush="{StaticResource BorderBrushGainsboro}">
+                                    <Grid>
+                                        <Border CornerRadius="3" VerticalAlignment="Bottom" Loaded="IdsPackLoaded" MinHeight="5">
+                                            <Border.Background>
+                                                <LinearGradientBrush>
+                                                    <GradientStop Offset="0" Color="#4DFFFFFF" />
+                                                    <GradientStop Offset="0.5" Color="{Binding IdsPack.LiquidType.LiquidTypeColor}" />
+                                                </LinearGradientBrush>
+                                            </Border.Background>
+                                        </Border>
+                                        <Rectangle Loaded="Limit_Loaded" Stroke="Red" StrokeThickness="2" VerticalAlignment="Bottom">
+                                            <Rectangle.Style>
+                                                <Style TargetType="Rectangle">
+                                                    <Style.Triggers>
+                                                        <EventTrigger RoutedEvent="Loaded">
+                                                            <EventTrigger.Actions>
+                                                                <BeginStoryboard Name="str">
+                                                                    <Storyboard>
+                                                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Duration="00:00:01" RepeatBehavior="Forever">
+                                                                            <DiscreteDoubleKeyFrame KeyTime="00:00:00" Value="1" />
+                                                                            <DiscreteDoubleKeyFrame KeyTime="00:00:0.5" Value="0" />
+                                                                        </DoubleAnimationUsingKeyFrames>
+                                                                    </Storyboard>
+                                                                </BeginStoryboard>
+                                                            </EventTrigger.Actions>
+                                                        </EventTrigger>
+                                                        <EventTrigger RoutedEvent="Unloaded">
+                                                            <EventTrigger.Actions>
+                                                                <RemoveStoryboard BeginStoryboardName="str" />
+                                                            </EventTrigger.Actions>
+                                                        </EventTrigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </Rectangle.Style>
+                                        </Rectangle>
+                                    </Grid>
+                                </Border>
+                            </StackPanel>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+            </Border>
+        </DockPanel>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml.cs
new file mode 100644
index 000000000..171cb754e
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using Tango.Integration.Operation;
+using static Tango.Integration.Operation.InsufficientLiquidQuantityException;
+
+namespace Tango.MachineStudio.Developer.Views
+{
+    /// <summary>
+    /// Interaction logic for InsufficientLiquidQuantityView.xaml
+    /// </summary>
+    public partial class InsufficientLiquidQuantityView : UserControl
+    {
+        public InsufficientLiquidQuantityView()
+        {
+            InitializeComponent();
+        }
+
+        private void IdsPackLoaded(object sender, RoutedEventArgs e)
+        {
+            Border border = sender as Border;
+            Grid parent = border.Parent as Grid;
+            IDSPackLevel packLevel = border.DataContext as IDSPackLevel;
+
+            border.Height = ((double)packLevel.Current / (double)MachineOperator.MAX_DISPENSER_NANOLITER) * parent.ActualHeight;
+        }
+
+        private void Limit_Loaded(object sender, RoutedEventArgs e)
+        {
+            Rectangle rect = sender as Rectangle;
+            Grid parent = rect.Parent as Grid;
+            IDSPackLevel packLevel = rect.DataContext as IDSPackLevel;
+
+            var top = ((double)packLevel.Required / (double)MachineOperator.MAX_DISPENSER_NANOLITER) * parent.ActualHeight;
+            rect.Margin = new Thickness(0, 0, 0, top);
+
+            if (packLevel.IsValid)
+            {
+                rect.Visibility = Visibility.Hidden;
+            }
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
index 861a639d3..3bda86036 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
@@ -753,13 +753,19 @@
                                                                 <StackPanel>
                                                                     <TextBlock>MEDIA</TextBlock>
                                                                     <StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
-                                                                        <ComboBox Width="250" ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML}" Style="{StaticResource TransparentComboBoxStyle}">
+                                                                        <ComboBox Width="250" ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML}" Style="{StaticResource TransparentComboBoxStyle}" HorizontalContentAlignment="Stretch">
                                                                             <ComboBox.ItemTemplate>
                                                                                 <DataTemplate>
-                                                                                    <StackPanel>
-                                                                                        <TextBlock Text="{Binding Name}" FontWeight="Bold" FontStyle="Italic"></TextBlock>
-                                                                                        <TextBlock FontSize="11" Text="{Binding Manufacturer}" Foreground="Gray"></TextBlock>
-                                                                                    </StackPanel>
+                                                                                    <DockPanel>
+                                                                                        <StackPanel DockPanel.Dock="Left">
+                                                                                            <TextBlock Text="{Binding Name}" FontWeight="Bold" FontStyle="Italic"></TextBlock>
+                                                                                            <TextBlock FontSize="11" Text="{Binding Manufacturer}" Foreground="Gray"></TextBlock>
+                                                                                        </StackPanel>
+                                                                                        <TextBlock Margin="20 0 0 0" VerticalAlignment="Center" HorizontalAlignment="Right">
+                                                                                            <Run Foreground="Gray">v:</Run>
+                                                                                            <Run FontWeight="Bold" Text="{Binding ColorConversionVersion,Mode=OneWay}"></Run>
+                                                                                        </TextBlock>
+                                                                                    </DockPanel>
                                                                                 </DataTemplate>
                                                                             </ComboBox.ItemTemplate>
                                                                         </ComboBox>
@@ -1425,20 +1431,15 @@
 
                                                 </DockPanel>
                                             </Border>
-                                            <ListBox ScrollViewer.VerticalScrollBarVisibility="Disabled" ScrollViewer.HorizontalScrollBarVisibility="Disabled" Background="Transparent" BorderThickness="0" Style="{x:Null}" HorizontalContentAlignment="Stretch" ItemsSource="{Binding RmlProcessParametersTableGroup.ProcessParametersTables}" SelectedItem="{Binding SelectedProcessParametersTable}" IsEnabled="{Binding RmlProcessParametersTableGroup.Active}">
+                                            <ListBox ScrollViewer.VerticalScrollBarVisibility="Disabled" ScrollViewer.HorizontalScrollBarVisibility="Disabled" Background="Transparent" BorderThickness="0" Style="{x:Null}" HorizontalContentAlignment="Stretch" ItemsSource="{Binding RmlProcessParametersTableGroup.ProcessParametersTables}" SelectedItem="{Binding SelectedProcessParametersTable}">
                                                 <ListBox.ItemContainerStyle>
                                                     <Style TargetType="ListBoxItem" BasedOn="{StaticResource basicListBoxItem}">
 
                                                     </Style>
                                                 </ListBox.ItemContainerStyle>
-                                                <!--<ListBox.ItemsPanel>
-                                            <ItemsPanelTemplate>
-                                                <WrapPanel IsItemsHost="True"></WrapPanel>
-                                            </ItemsPanelTemplate>
-                                        </ListBox.ItemsPanel>-->
                                                 <ListBox.ItemTemplate>
                                                     <DataTemplate DataType="{x:Type observables:ProcessParametersTable}">
-                                                        <Border Padding="5" CornerRadius="5" BorderThickness="1" Margin="5">
+                                                        <Border Padding="5" CornerRadius="5" BorderThickness="1" Margin="5" IsEnabled="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.RmlProcessParametersTableGroup.Active}">
                                                             <Border.Style>
                                                                 <Style TargetType="Border">
                                                                     <Setter Property="BorderBrush" Value="{StaticResource borderBrush}"></Setter>
@@ -1450,6 +1451,11 @@
                                                                             <Setter Property="Background" Value="{StaticResource TransparentBackgroundBrush300}"></Setter>
                                                                             <Setter Property="Opacity" Value="1"></Setter>
                                                                         </DataTrigger>
+                                                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.AutoProcessSelection}" Value="True">
+                                                                            <Setter Property="BorderBrush" Value="{StaticResource AccentColorBrush}"></Setter>
+                                                                            <Setter Property="Background" Value="Transparent"></Setter>
+                                                                            <Setter Property="Opacity" Value="1"></Setter>
+                                                                        </DataTrigger>
                                                                     </Style.Triggers>
                                                                 </Style>
                                                             </Border.Style>
@@ -1520,7 +1526,8 @@
                                                                         </WrapPanel>
                                                                     </DockPanel>
 
-                                                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="5" Visibility="{Binding RelativeSource={RelativeSource AncestorType=ListBoxItem},Path=IsSelected,Converter={StaticResource BooleanToVisibilityConverter}}">
+                                                                    <Grid HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="5">
+                                                                    <StackPanel Orientation="Horizontal" Visibility="{Binding RelativeSource={RelativeSource AncestorType=ListBoxItem},Path=IsSelected,Converter={StaticResource BooleanToVisibilityConverter}}">
                                                                         <TextBlock Text="Active" FontWeight="Bold" FontStyle="Italic" FontSize="13" VerticalAlignment="Center"></TextBlock>
                                                                         <materialDesign:PackIcon Foreground="{StaticResource GreenBrush400}" Kind="CheckboxBlankCircle" VerticalAlignment="Center" Margin="5 0 0 0">
                                                                             <materialDesign:PackIcon.Style>
@@ -1553,6 +1560,7 @@
                                                                             </materialDesign:PackIcon.Style>
                                                                         </materialDesign:PackIcon>
                                                                     </StackPanel>
+                                                                    </Grid>
                                                                 </StackPanel>
                                                             </Grid>
                                                         </Border>
@@ -1560,24 +1568,32 @@
                                                 </ListBox.ItemTemplate>
                                             </ListBox>
 
-                                            <StackPanel Margin="10 20" VerticalAlignment="Bottom" Orientation="Horizontal" HorizontalAlignment="Right">
-                                                <Button Height="40" Width="105" Command="{Binding ResetProcessParametersCommand}" Background="Transparent" BorderBrush="{StaticResource DarkGrayBrush200}" Foreground="{StaticResource DarkGrayBrush200}" Margin="0 2 10 0" ToolTip="Resets the current process parameters in the embedded device">
-                                                    <TextBlock TextWrapping="Wrap" TextAlignment="Center">
+                                            <StackPanel Margin="10 10" VerticalAlignment="Bottom">
+
+                                                <StackPanel Orientation="Horizontal">
+                                                    <ToggleButton IsChecked="{Binding AutoProcessSelection}" />
+                                                    <TextBlock Margin="5 0 0 0">Use Recommended Process Parameters (auto)</TextBlock>
+                                                </StackPanel>
+
+                                                <StackPanel Margin="0 40 0 0" Orientation="Horizontal" HorizontalAlignment="Right">
+                                                    <Button Height="40" Width="105" Command="{Binding ResetProcessParametersCommand}" Background="Transparent" BorderBrush="{StaticResource DarkGrayBrush200}" Foreground="{StaticResource DarkGrayBrush200}" Margin="0 2 10 0" ToolTip="Resets the current process parameters in the embedded device">
+                                                        <TextBlock TextWrapping="Wrap" TextAlignment="Center">
                                                         TEMP OFF
-                                                    </TextBlock>
-                                                </Button>
-                                                <Button Height="40" Command="{Binding SaveProcessParametersCommand}" HorizontalAlignment="Left" IsEnabled="{Binding AuthenticationProvider.CurrentUser,Converter={StaticResource UserRoleToBooleanConverter},ConverterParameter='Researcher'}">
-                                                    <StackPanel Orientation="Horizontal">
-                                                        <materialDesign:PackIcon VerticalAlignment="Center" Kind="ContentSave"></materialDesign:PackIcon>
-                                                        <TextBlock Margin="10 0 0 0">SAVE PARAMETERS</TextBlock>
-                                                    </StackPanel>
-                                                </Button>
-                                                <Button Height="40" Margin="10 0 0 0" Command="{Binding PushProcessParametersCommand}" HorizontalAlignment="Left">
-                                                    <StackPanel Orientation="Horizontal">
-                                                        <materialDesign:PackIcon VerticalAlignment="Center" Kind="ArrowRightBold"></materialDesign:PackIcon>
-                                                        <TextBlock Margin="10 0 0 0">PUSH PARAMETERS</TextBlock>
-                                                    </StackPanel>
-                                                </Button>
+                                                        </TextBlock>
+                                                    </Button>
+                                                    <Button Height="40" Command="{Binding SaveProcessParametersCommand}" HorizontalAlignment="Left" IsEnabled="{Binding AuthenticationProvider.CurrentUser,Converter={StaticResource UserRoleToBooleanConverter},ConverterParameter='Researcher'}">
+                                                        <StackPanel Orientation="Horizontal">
+                                                            <materialDesign:PackIcon VerticalAlignment="Center" Kind="ContentSave"></materialDesign:PackIcon>
+                                                            <TextBlock Margin="10 0 0 0">SAVE PARAMETERS</TextBlock>
+                                                        </StackPanel>
+                                                    </Button>
+                                                    <Button Height="40" Margin="10 0 0 0" Command="{Binding PushProcessParametersCommand}" HorizontalAlignment="Left">
+                                                        <StackPanel Orientation="Horizontal">
+                                                            <materialDesign:PackIcon VerticalAlignment="Center" Kind="ArrowRightBold"></materialDesign:PackIcon>
+                                                            <TextBlock Margin="10 0 0 0">PUSH PARAMETERS</TextBlock>
+                                                        </StackPanel>
+                                                    </Button>
+                                                </StackPanel>
                                             </StackPanel>
                                         </StackPanel>
                                     </Grid>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
index 18dc795bd..28e488aae 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
@@ -251,7 +251,7 @@ namespace Tango.MachineStudio.Developer.Views
 
         private void BrushPicker_ColorChanged(object sender, BrushPicker.ColorChangedEventArgs e)
         {
-           
+
         }
 
         private void ColorCanvas_SelectedColorChanged(object sender, RoutedPropertyChangedEventArgs<Color?> e)
@@ -284,7 +284,7 @@ namespace Tango.MachineStudio.Developer.Views
 
         private void listBoxSegments_PreviewMouseDown(object sender, MouseButtonEventArgs e)
         {
-            
+
         }
 
         private void listBoxSegments_MouseEnter(object sender, MouseEventArgs e)
@@ -295,22 +295,26 @@ namespace Tango.MachineStudio.Developer.Views
 
         private void OnBrushStopFieldValueChanged(object sender, RoutedPropertyChangedEventArgs<double?> e)
         {
-            BrushStop stop = null;
-            var dataContext = (sender as FrameworkElement).DataContext;
-
-            if (dataContext != null)
+            try
             {
-                if (dataContext is BrushStop)
-                {
-                    stop = dataContext as BrushStop;
-                }
-                else
+                BrushStop stop = null;
+                var dataContext = (sender as FrameworkElement).DataContext;
+
+                if (dataContext != null)
                 {
-                    stop = (dataContext as LiquidVolume).BrushStop;
-                }
+                    if (dataContext is BrushStop)
+                    {
+                        stop = dataContext as BrushStop;
+                    }
+                    else
+                    {
+                        stop = (dataContext as LiquidVolume).BrushStop;
+                    }
 
-                _vm.OnBrushStopFieldValueChanged(stop);
+                    _vm.OnBrushStopFieldValueChanged(stop);
+                }
             }
+            catch { }
         }
 
         private void OnBrushStopMouseDown(object sender, MouseButtonEventArgs e)
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml
index 70d5b6180..f8a10e7c4 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml
@@ -260,12 +260,27 @@
                         </Grid>
                     </DockPanel>
 
-                    <Button Command="{Binding ImportEmbroideryFileCommand}" Margin="20 0 0 -100" Foreground="{StaticResource BlackForegroundBrush}" FontSize="16" VerticalAlignment="Bottom" HorizontalAlignment="Left" Style="{StaticResource emptyButton}" Cursor="Hand">
-                        <StackPanel Orientation="Horizontal">
-                            <Image Source="../Images/sewing-machine.png" Width="32"></Image>
-                            <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" TextDecorations="Underline">Import Embroidery File</TextBlock>
-                        </StackPanel>
-                    </Button>
+                    <StackPanel Margin="20 0 0 -100" VerticalAlignment="Bottom" HorizontalAlignment="Left" Orientation="Horizontal">
+                        <Button Command="{Binding ImportJobFileCommand}" Foreground="{StaticResource BlackForegroundBrush}" FontSize="16" Style="{StaticResource emptyButton}" Cursor="Hand">
+                            <StackPanel Orientation="Horizontal">
+                                <materialDesign:PackIcon Kind="FileImport" VerticalAlignment="Center" Width="30" Height="30" />
+                                <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" TextDecorations="Underline">Import Job File</TextBlock>
+                            </StackPanel>
+                        </Button>
+
+                        <Button Margin="30 0 0 0" Command="{Binding ExportJobFileCommand}" Foreground="{StaticResource BlackForegroundBrush}" FontSize="16" Style="{StaticResource emptyButton}" Cursor="Hand">
+                            <StackPanel Orientation="Horizontal">
+                                <materialDesign:PackIcon Kind="FileExport" VerticalAlignment="Center" Width="30" Height="30" />
+                                <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" TextDecorations="Underline">Export Job File</TextBlock>
+                            </StackPanel>
+                        </Button>
+                        <Button Margin="30 0 0 0" Command="{Binding ImportEmbroideryFileCommand}" Foreground="{StaticResource BlackForegroundBrush}" FontSize="16" Style="{StaticResource emptyButton}" Cursor="Hand">
+                            <StackPanel Orientation="Horizontal">
+                                <Image Source="../Images/sewing-machine.png" Width="32"></Image>
+                                <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" TextDecorations="Underline">Import Embroidery File</TextBlock>
+                            </StackPanel>
+                        </Button>
+                    </StackPanel>
                 </Grid>
             </Grid>
         </Grid>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/app.config b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/app.config
index ff251eb7d..1fafd5ffd 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/app.config
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/app.config
@@ -20,7 +20,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.IO.FileSystem" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -28,27 +28,27 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.IO.FileSystem.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Security.Cryptography.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Console" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Diagnostics.StackTrace" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Xml.ReaderWriter" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -72,7 +72,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.19.8.16603" newVersion="3.19.8.16603" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.5.0" newVersion="5.0.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/packages.config b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/packages.config
index 999461d6a..85174f848 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/packages.config
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/packages.config
@@ -8,6 +8,8 @@
   <package id="MahApps.Metro" version="1.5.0" targetFramework="net46" />
   <package id="MaterialDesignColors" version="1.1.2" targetFramework="net46" />
   <package id="MaterialDesignThemes" version="2.3.1.953" targetFramework="net46" />
+  <package id="Microsoft.WindowsAPICodePack-Core" version="1.1.0.0" targetFramework="net461" />
+  <package id="Microsoft.WindowsAPICodePack-Shell" version="1.1.0.0" targetFramework="net461" />
   <package id="System.Reactive" version="3.1.1" targetFramework="net46" />
   <package id="System.Reactive.Core" version="3.1.1" targetFramework="net46" />
   <package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net46" />