Merged RML Extensions feature !!!!

1 files changed, 19 insertions, 0 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
index 13cac9c88..bde174f07 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
@@ -184,6 +184,17 @@ namespace Tango.MachineStudio.RML.ViewModels
             set { _colorCalibrationVM = value; RaisePropertyChangedAuto(); }
         }
 
+        private List<String> _manufacturers;
+        public List<String> Manufacturers
+        {
+            get { return _manufacturers; }
+            set
+            {
+                _manufacturers = value;
+                RaisePropertyChangedAuto();
+            }
+        }
+
         private String _RMLFilter;
         /// <summary>
         /// Gets or sets the job filter.
@@ -397,6 +408,13 @@ namespace Tango.MachineStudio.RML.ViewModels
                         }
                     }
 
+                    if (!String.IsNullOrEmpty(ActiveRML.Manufacturer) && false == Manufacturers.Any(x => x == ActiveRML.Manufacturer))
+                    {
+                        _active_context.YarnManufacturers.Add(new YarnManufacturer() { Name = ActiveRML.Manufacturer });
+                        await _active_context.SaveChangesAsync();
+                        Manufacturers.Add(ActiveRML.Manufacturer);
+                    }
+
                     ActiveProcessParametersGroup = ActiveRML.ProcessParametersTablesGroups.ToList().FirstOrDefault();
                     ActiveProcessParametersTableView = CollectionViewSource.GetDefaultView(ActiveProcessParametersGroup.ProcessParametersTables);
                     ActiveProcessParametersTableView.SortDescriptions.Add(new SortDescription(nameof(ProcessParametersTable.TableIndex), ListSortDirection.Ascending));
@@ -482,6 +500,7 @@ namespace Tango.MachineStudio.RML.ViewModels
             SpoolTypes = _active_context.SpoolTypes.ToObservableCollection();
             BtsrApplicationTypes = _active_context.BtsrApplicationTypes.ToObservableCollection();
             BtsrYarnTypes = _active_context.BtsrYarnTypes.ToObservableCollection();
+            Manufacturers = _active_context.YarnManufacturers.Select(x => x.Name).ToList();
         }
 
         private async void AddNewRml()