From 00a491d93733d4625ad329b2ba8237f445364b3f Mon Sep 17 00:00:00 2001
From: Mirta <mirta@twine-s.com>
Date: Wed, 30 Dec 2020 16:39:52 +0200
Subject: merge

---
 .../MachineStudioSettings.cs                       | 37 ++++------------------
 1 file changed, 6 insertions(+), 31 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs')

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
index 25dfc2dc8..c307a8e33 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
@@ -8,10 +8,8 @@ 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
@@ -41,11 +39,6 @@ namespace Tango.MachineStudio.Common
         /// </summary>
         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>
@@ -56,6 +49,11 @@ namespace Tango.MachineStudio.Common
         /// </summary>
         public String LastVirtualMachineSerialNumber { get; set; }
 
+        /// <summary>
+        /// Gets or sets the logging categories.
+        /// </summary>
+        public List<LogCategory> LoggingCategories { get; set; }
+
         /// <summary>
         /// Gets or sets the last bounds.
         /// </summary>
@@ -136,26 +134,6 @@ namespace Tango.MachineStudio.Common
         /// </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>
@@ -184,6 +162,7 @@ namespace Tango.MachineStudio.Common
         public MachineStudioSettings()
         {
             LastBounds = new Rect();
+            LoggingCategories = new List<LogCategory>();
             DefaultIssueReportTags = new List<string>();
             StudioModulesBounds = new List<StudioModuleBounds>();
             Environment = WorkingEnvironment.Remote;
@@ -194,10 +173,6 @@ namespace Tango.MachineStudio.Common
             Theme = MachineStudioTheme.Light;
             JobUnitsMethod = JobUnitsMethods.Operator;
             ExternalBridgeRequestTimeout = TimeSpan.FromSeconds(5);
-            ExternalBridgeContinuousRequestTimeout = TimeSpan.FromSeconds(5);
-            ExternalBridgeSignalRHub = "ExternalBridgeHub";
-            EnableExternalBridgeSignalR = true;
-            TcpTransportAdapterWriteMode = TcpTransportAdapterWriteMode.Interval;
         }
     }
 }
-- 
cgit v1.3.1