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

1 files changed, 37 insertions, 0 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
index 781e034e8..7a016b376 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
@@ -8,8 +8,10 @@ using System.Windows;
 using Tango.BL;
 using Tango.Integration.Operation;
 using Tango.Logging;
+using Tango.MachineStudio.Common.Web;
 using Tango.PMR.Printing;
 using Tango.Settings;
+using Tango.Transport.Adapters;
 using Tango.Web;
 
 namespace Tango.MachineStudio.Common
@@ -40,6 +42,11 @@ namespace Tango.MachineStudio.Common
         public String LastLoginPassword { get; set; }
 
         /// <summary>
+        /// Gets or sets the last login method.
+        /// </summary>
+        public LoginMethod LastLoginMethod { get; set; }
+
+        /// <summary>
         /// Gets or sets a value indicating whether to save the user credentials.
         /// </summary>
         public bool RememberMe { get; set; }
@@ -130,6 +137,31 @@ namespace Tango.MachineStudio.Common
         public TimeSpan MaximumCacheTime { get; set; }
 
         /// <summary>
+        /// Gets or sets the external bridge request timeout.
+        /// </summary>
+        public TimeSpan ExternalBridgeRequestTimeout { get; set; }
+
+        /// <summary>
+        /// Gets or sets the external bridge continuous request timeout.
+        /// </summary>
+        public TimeSpan ExternalBridgeContinuousRequestTimeout { get; set; }
+
+        /// <summary>
+        /// Gets or sets the external bridge SignalR hub.
+        /// </summary>
+        public String ExternalBridgeSignalRHub { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to enable external bridge scanning via SignalR.
+        /// </summary>
+        public bool EnableExternalBridgeSignalR { get; set; }
+
+        /// <summary>
+        /// Gets or sets the TCP transport adapter write mode.
+        /// </summary>
+        public TcpTransportAdapterWriteMode TcpTransportAdapterWriteMode { get; set; }
+
+        /// <summary>
         /// Gets the machine service address.
         /// </summary>
         public String MachineServiceAddress
@@ -167,6 +199,11 @@ namespace Tango.MachineStudio.Common
             CachingMode = ObservablesContextInMemoryCachingMode.None;
             Theme = MachineStudioTheme.Light;
             JobUnitsMethod = JobUnitsMethods.Operator;
+            ExternalBridgeRequestTimeout = TimeSpan.FromSeconds(5);
+            ExternalBridgeContinuousRequestTimeout = TimeSpan.FromSeconds(5);
+            ExternalBridgeSignalRHub = "ExternalBridgeHub";
+            EnableExternalBridgeSignalR = true;
+            TcpTransportAdapterWriteMode = TcpTransportAdapterWriteMode.Interval;
         }
     }
 }