Deprecated the use of loaded rml, default rml, default spool type, target color spaces, target job types and implemented through settings on PPC.

Related Work Items: #1499

1 files changed, 23 insertions, 4 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs
index 8ed512670..598b1a194 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs
@@ -108,6 +108,20 @@ namespace Tango.PPC.MachineSettings.ViewModels
             set { _lockScreenPassword = value; RaisePropertyChangedAuto(); }
         }
 
+        private Rml _defaultRML;
+        public Rml DefaultRML
+        {
+            get { return _defaultRML; }
+            set { _defaultRML = value; RaisePropertyChangedAuto(); }
+        }
+
+        private SpoolType _defaultSpoolType;
+        public SpoolType DefaultSpoolType
+        {
+            get { return _defaultSpoolType; }
+            set { _defaultSpoolType = value; RaisePropertyChangedAuto(); }
+        }
+
         #endregion
 
         #region Commands
@@ -139,8 +153,8 @@ namespace Tango.PPC.MachineSettings.ViewModels
         {
             if (Validate())
             {
-                Machine.SupportedJobTypes = SelectedJobTypes.SynchedSource.ToList();
-                Machine.SupportedColorSpaces = SelectedColorSpaces.SynchedSource.ToList();
+                Settings.SupportedJobTypes = SelectedJobTypes.SynchedSource.ToList();
+                Settings.SupportedColorSpaces = SelectedColorSpaces.SynchedSource.ToList();
                 Machine.MapPrimitivesWithStrings(MachineProvider.Machine);
 
                 Settings.EnableHotSpot = EnableHotSpot;
@@ -150,6 +164,8 @@ namespace Tango.PPC.MachineSettings.ViewModels
                 Settings.EnableLockScreen = EnableLockScreen;
                 Settings.LockScreenTimeout = TimeSpan.FromMinutes(LockScreenTimeoutMinutes);
                 Settings.LockScreenPassword = LockScreenPassword;
+                Settings.DefaultRmlGuid = DefaultRML?.Guid;
+                Settings.DefaultSpoolTypeGuid = DefaultSpoolType?.Guid;
                 Settings.Save();
 
                 await MachineProvider.SaveMachine();
@@ -195,8 +211,11 @@ namespace Tango.PPC.MachineSettings.ViewModels
             LockScreenTimeoutMinutes = (int)Settings.LockScreenTimeout.TotalMinutes;
             LockScreenPassword = Settings.LockScreenPassword;
 
-            SelectedJobTypes = new SelectedObjectCollection<JobTypes>(Enum.GetValues(typeof(JobTypes)).Cast<JobTypes>().ToObservableCollection(), Machine.SupportedJobTypes.ToObservableCollection());
-            SelectedColorSpaces = new SelectedObjectCollection<ColorSpaces>(Enum.GetValues(typeof(ColorSpaces)).Cast<ColorSpaces>().Where(x => x.IsUserSpace()).ToObservableCollection(), Machine.SupportedColorSpaces.ToObservableCollection());
+            SelectedJobTypes = new SelectedObjectCollection<JobTypes>(Enum.GetValues(typeof(JobTypes)).Cast<JobTypes>().ToObservableCollection(), Settings.SupportedJobTypes.ToObservableCollection());
+            SelectedColorSpaces = new SelectedObjectCollection<ColorSpaces>(Enum.GetValues(typeof(ColorSpaces)).Cast<ColorSpaces>().Where(x => x.IsUserSpace()).ToObservableCollection(), Settings.SupportedColorSpaces.ToObservableCollection());
+
+            DefaultRML = Adapter.Rmls.SingleOrDefault(x => x.Guid == Settings.DefaultRmlGuid);
+            DefaultSpoolType = Adapter.SpoolTypes.SingleOrDefault(x => x.Guid == Settings.DefaultSpoolTypeGuid);
         }
 
         private async void OnEnableRemoteAssistanceChanged()