From bf2f3245339b9fd9148a2ad25b5ba3320e970cc1 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Mon, 27 Jan 2020 00:51:16 +0200
Subject: Added TCP write mode setting to MS settings. Added External Bridge
 TCP and SignalR settings to advanced settings on PPC. Added FailsWithAdapter
 to ExternalBridgeReceiver. Added TCP write mode to ExternalBridgeService.
 Added some error handling on ExternalBridgeService SignalR.

---
 .../MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs    | 5 +++++
 .../MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml        | 4 ++++
 2 files changed, 9 insertions(+)

(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 23765de35..2a00386dc 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -473,6 +473,11 @@ namespace Tango.MachineStudio.UI.ViewModels
                             x.SelectedMachine.ContinuousRequestTimeout = _settings.ExternalBridgeContinuousRequestTimeout;
                         }
 
+                        if (x.SelectedMachine.Adapter is TcpTransportAdapter)
+                        {
+                            (x.SelectedMachine.Adapter as TcpTransportAdapter).WriteMode = _settings.TcpTransportAdapterWriteMode;
+                        }
+
                         if (x.SelectedMachine.RequiresAuthentication)
                         {
                             ConnectToMachineSecure(x.SelectedMachine as IExternalBridgeSecureClient);
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
index 82d628785..22c1a5c00 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
@@ -9,6 +9,7 @@
              xmlns:pmrPrinting="clr-namespace:Tango.PMR.Printing;assembly=Tango.PMR"
              xmlns:operation="clr-namespace:Tango.Integration.Operation;assembly=Tango.Integration"
              xmlns:bl="clr-namespace:Tango.BL;assembly=Tango.BL"
+             xmlns:adapters="clr-namespace:Tango.Transport.Adapters;assembly=Tango.Transport"
              xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views"
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300" Width="600" Height="700" Background="{StaticResource Dialog.Background}" d:DataContext="{d:DesignInstance Type=vm:AboutViewVM, IsDesignTimeCreatable=False}" DataContext="{Binding AboutViewVM, Source={StaticResource Locator}}" Foreground="{StaticResource MainWindow.Foreground}">
@@ -75,6 +76,9 @@
                             <TextBlock FontWeight="SemiBold">Job Units Duplication Method:</TextBlock>
                             <ComboBox HorizontalAlignment="Left" Width="150" DockPanel.Dock="Left" ItemsSource="{Binding Source={x:Type operation:JobUnitsMethods},Converter={StaticResource EnumToItemsSourceConverter}}" SelectedValue="{Binding MachineStudioSettings.JobUnitsMethod}" SelectedValuePath="Value" DisplayMemberPath="DisplayName"></ComboBox>
 
+                            <TextBlock FontWeight="SemiBold">External Bridge TCP Write Mode:</TextBlock>
+                            <ComboBox HorizontalAlignment="Left" Width="150" DockPanel.Dock="Left" ItemsSource="{Binding Source={x:Type adapters:TcpTransportAdapterWriteMode},Converter={StaticResource EnumToItemsSourceConverter}}" SelectedValue="{Binding MachineStudioSettings.TcpTransportAdapterWriteMode}" SelectedValuePath="Value" DisplayMemberPath="DisplayName"></ComboBox>
+
                         </controls:TableGrid>
 
                         <DockPanel Margin="0 0 0 0">
-- 
cgit v1.3.1