merge

1 files changed, 7 insertions, 183 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs
index aacbe8901..b1bc3faad 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs
@@ -4,13 +4,9 @@ using System.Linq;
 using System.ServiceModel;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.BL.Enumerations;
-using Tango.Integration.Operation;
 using Tango.Logging;
-using Tango.PMR.Integration;
 using Tango.PMR.Printing;
 using Tango.Settings;
-using Tango.Transport.Adapters;
 using Tango.Web;
 
 namespace Tango.PPC.Common
@@ -22,6 +18,11 @@ namespace Tango.PPC.Common
     public class PPCSettings : SettingsBase
     {
         /// <summary>
+        /// Gets or sets the logging categories.
+        /// </summary>
+        public List<LogCategory> LoggingCategories { get; set; }
+
+        /// <summary>
         /// Gets or sets the state of the application.
         /// </summary>
         public ApplicationStates ApplicationState { get; set; }
@@ -137,157 +138,6 @@ namespace Tango.PPC.Common
         public bool EnableJobLiquidQuantityValidation { get; set; }
 
         /// <summary>
-        /// Gets or sets the job number of units method.
-        /// </summary>
-        public JobUnitsMethods JobUnitsMethod { get; set; }
-
-        /// <summary>
-        /// Gets or sets the loaded RML unique identifier.
-        /// </summary>
-        public String LoadedRmlGuid { get; set; }
-
-        /// <summary>
-        /// Gets or sets the default RML unique identifier.
-        /// </summary>
-        public String DefaultRmlGuid { get; set; }
-
-        /// <summary>
-        /// Gets or sets the default color space unique identifier.
-        /// </summary>
-        public List<ColorSpaces> SupportedColorSpaces { get; set; }
-
-        /// <summary>
-        /// Gets or sets the target job types.
-        /// </summary>
-        public List<JobTypes> SupportedJobTypes { get; set; }
-
-        /// <summary>
-        /// Gets or sets the default spool type unique identifier.
-        /// </summary>
-        public String DefaultSpoolTypeGuid { get; set; }
-
-        /// <summary>
-        /// Gets or sets the default length of the segment.
-        /// </summary>
-        public int DefaultSegmentLength { get; set; }
-
-        /// <summary>
-        /// Gets or sets the previous application version.
-        /// </summary>
-        public String PreviousApplicationVersion { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether synchronize jobs with twine server.
-        /// </summary>
-        public bool SynchronizeJobs { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether synchronize diagnostics data.
-        /// </summary>
-        public bool SynchronizeDiagnostics { get; set; }
-
-        /// <summary>
-        /// Gets or sets the synchronization interval.
-        /// </summary>
-        public TimeSpan SynchronizationInterval { get; set; }
-
-        /// <summary>
-        /// Gets or sets the known firmware version.
-        /// </summary>
-        public String FirmwareVersion { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to display the power up screen.
-        /// </summary>
-        public bool DisplayPowerUpScreen { get; set; }
-
-        /// <summary>
-        /// Gets or sets the power up screen timeout.
-        /// </summary>
-        public TimeSpan PowerUpScreenTimeout { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to automatically check for software and database (quick) updates.
-        /// </summary>
-        public bool AutoCheckForUpdates { get; set; }
-
-        /// <summary>
-        /// Gets or sets the automatic update check interval.
-        /// </summary>
-        public TimeSpan AutoUpdateCheckInterval { get; set; }        
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to enable the automatic thread loading support.
-        /// </summary>
-        public bool EnableAutomaticThreadLoading { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to display the thread loading screen.
-        /// </summary>
-        public bool DisplayAutomaticThreadLoadingScreen { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to enable embedded debug logs.
-        /// </summary>
-        public bool EnableEmbeddedDebugLogs { get; set; }
-
-        /// <summary>
-        /// Gets or sets the TCP transport adapter write mode.
-        /// </summary>
-        public TcpTransportAdapterWriteMode TcpTransportAdapterWriteMode { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to expose the external bridge service via SignalR.
-        /// </summary>
-        public bool EnableExternalBridgeSignalR { get; set; }
-
-        /// <summary>
-        /// Gets or sets the name of the exteral bridge SignalR hub.
-        /// </summary>
-        public String ExternalBridgeSignalRHub { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to enable the internal remote desktop service.
-        /// </summary>
-        public bool EnableRemoteDesktop { get; set; }
-
-        /// <summary>
-        /// Gets or sets the internal remote desktop service frame rate (1-20).
-        /// </summary>
-        public int RemoteDesktopFrameRate { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to enable insights.
-        /// </summary>
-        public bool InsightsEnabled { get; set; }
-
-        /// <summary>
-        /// Gets or sets the insights sampling interval.
-        /// </summary>
-        public TimeSpan InsightsSamplingInterval { get; set; }
-
-        /// <summary>
-        /// Gets or sets the insights storage cleanup interval.
-        /// </summary>
-        public TimeSpan InsightsStorageCleanupInterval { get; set; }
-
-        /// <summary>
-        /// Gets or sets the duration of the insights maximum storage duration.
-        /// </summary>
-        public TimeSpan InsightsMaxStorageDuration { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to bypass Internet connectivity checks before attempting to perform an update for example.
-        /// </summary>
-        public bool BypassInternetConnectivityCheck { get; set; }
-
-        /// <summary>
-        /// Gets or sets the last database backup file that was generated before application update.
-        /// If updater utility was successful, this file should be deleted. Otherwise should be restored.
-        /// </summary>
-        public String LastDatabaseBackupFile { get; set; }
-
-        /// <summary>
         /// Gets the machine service address.
         /// </summary>
         /// <returns></returns>
@@ -305,44 +155,18 @@ namespace Tango.PPC.Common
             EnableGradientGeneration = true;
             GradientGenerationResolution = 20;
             MachineScanningTimeoutSeconds = 20;
+            LoggingCategories = new List<LogCategory>();
             EmbeddedComPort = "COM10";
             EmbeddedDeviceHint = "Tango USB Serial Port";
             ExternalBridgePassword = "Aa123456";
             HotSpotPassword = "Aa123456";
             LockScreenTimeout = TimeSpan.FromMinutes(10);
             LockScreenPassword = "1111";
-            DeploymentSlot = DeploymentSlot.DEV;
+            DeploymentSlot = DeploymentSlot.TEST;
             EnableWatchDog = true;
             EnableEmergencyNotifications = true;
             EmergencyComPort = "COM2";
             EnableJobLiquidQuantityValidation = true;
-            JobUnitsMethod = JobUnitsMethods.Device;
-            DefaultSegmentLength = 100;
-            SupportedColorSpaces = new List<ColorSpaces>();
-            SupportedJobTypes = new List<JobTypes>();
-            PreviousApplicationVersion = "1.0.0.0";
-            SynchronizeJobs = false;
-            SynchronizeDiagnostics = true;
-            SynchronizationInterval = TimeSpan.FromMinutes(60);
-            FirmwareVersion = "1.0.0.0";
-            DisplayPowerUpScreen = true;
-            PowerUpScreenTimeout = TimeSpan.FromSeconds(60);
-            AutoCheckForUpdates = true;
-            AutoUpdateCheckInterval = TimeSpan.FromMinutes(30);
-            EnableAutomaticThreadLoading = true;
-            DisplayAutomaticThreadLoadingScreen = true;
-            EnableEmbeddedDebugLogs = true;
-            TcpTransportAdapterWriteMode = TcpTransportAdapterWriteMode.Interval;
-            EnableExternalBridgeSignalR = true;
-            ExternalBridgeSignalRHub = "ExternalBridgeHub";
-            EnableRemoteDesktop = true;
-            RemoteDesktopFrameRate = 5;
-            BypassInternetConnectivityCheck = false;
-
-            InsightsEnabled = true;
-            InsightsSamplingInterval = TimeSpan.FromMinutes(1);
-            InsightsMaxStorageDuration = TimeSpan.FromDays(30);
-            InsightsStorageCleanupInterval = TimeSpan.FromMinutes(60);
         }
     }
 }