From b6554a1fa87da50ba7c72ccf5df6bc198445640b Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Wed, 12 Dec 2018 12:58:10 +0200
Subject: Added organization for ExternalBridgeTcpClient. Clear TCP machine
 when restarting ExternalBridgeScanner. Fixed issue with wrong
 NanoliterPerPulse when converting from job to PMR job.

---
 .../MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs     | 4 ++--
 .../Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml            | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI')

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
index d1f9cda64..c9cd3276f 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -454,9 +454,9 @@ namespace Tango.MachineStudio.UI.ViewModels
                         if (x.SelectedMachine.RequiresAuthentication)
                         {
                             //Check machine exist on my database first
-                            if (!ObservablesStaticCollections.Instance.Machines.ToList().Exists(y => y.SerialNumber == x.SelectedMachine.SerialNumber))
+                            if (x.SelectedMachine.Machine == null)
                             {
-                                _notificationProvider.ShowError( $"The specified machine '{x.SelectedMachine.SerialNumber}' could not be found on the database.");
+                                _notificationProvider.ShowError( $"The specified machine '{x.SelectedMachine.SerialNumber}' could not be found on the database. Aborting connection.");
                                 return;
                             }
 
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
index b1502f374..2e2dd1285 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
@@ -95,6 +95,8 @@
                                     <ToggleButton IsChecked="{Binding EnableDiagnostics}" HorizontalAlignment="Left"></ToggleButton>
                                     <TextBlock FontWeight="SemiBold" Text="Enable Embedded Debug Logs:" />
                                     <ToggleButton IsChecked="{Binding EnableEmbeddedDebugging}" HorizontalAlignment="Left"></ToggleButton>
+                                    <TextBlock FontWeight="SemiBold" Text="Enable KeepAlive:" />
+                                    <ToggleButton IsChecked="{Binding UseKeepAlive}" HorizontalAlignment="Left"></ToggleButton>
                                     <TextBlock FontWeight="SemiBold" Text="Enable Events:" />
                                     <ToggleButton IsChecked="{Binding EnableEventsNotification}" HorizontalAlignment="Left"></ToggleButton>
                                 </controls:TableGrid>
@@ -181,6 +183,8 @@
                                     <ToggleButton IsChecked="{Binding EnableDiagnostics}" HorizontalAlignment="Left"></ToggleButton>
                                     <TextBlock FontWeight="SemiBold" Text="Enable Embedded Debug Logs:" />
                                     <ToggleButton IsChecked="{Binding EnableEmbeddedDebugging}" HorizontalAlignment="Left"></ToggleButton>
+                                    <TextBlock FontWeight="SemiBold" Text="Enable KeepAlive:" />
+                                    <ToggleButton IsChecked="{Binding UseKeepAlive}" HorizontalAlignment="Left"></ToggleButton>
                                     <TextBlock FontWeight="SemiBold" Text="Enable Events:" />
                                     <ToggleButton IsChecked="{Binding EnableEventsNotification}" HorizontalAlignment="Left"></ToggleButton>
                                 </controls:TableGrid>
-- 
cgit v1.3.1


From addd1037c4f8580016f8c5fd4f8c5520965f8778 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Wed, 12 Dec 2018 12:58:42 +0200
Subject: Machine Studio v3.5.79

---
 .../MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI')

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
index 701fd50b9..c311df44b 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
@@ -4,5 +4,5 @@ using System.Runtime.InteropServices;
 
 [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)]
 [assembly: AssemblyTitle("Tango - Machine Studio")]
-[assembly: AssemblyVersion("3.5.78.18305")]
+[assembly: AssemblyVersion("3.5.79.18305")]
 [assembly: ComVisible(false)]
\ No newline at end of file
-- 
cgit v1.3.1