MS . RML Extension

2 files changed, 23 insertions, 2 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs
index 820a55558..d6f3ea418 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs
@@ -973,7 +973,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
             }
         }
 
-        private void LoadRmlProperties()
+        private async void LoadRmlProperties()
         {
             Applications = _active_context.YarnApplications.ToObservableCollection();
             Brands = _active_context.YarnBrands.ToObservableCollection();
@@ -991,7 +991,9 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
             Texturing = _active_context.YarnTexturings.ToObservableCollection();
             YarnTypes = _active_context.YarnTypes.ToObservableCollection();
             IndustrySector = _active_context.YarnIndustrysectors.ToObservableCollection();
-            Machines = ObservablesStaticCollections.Instance.Machines.Select(x => new MachineModel()
+
+            var machines = await new MachinesCollectionBuilder(_active_context).SetAll().WithConfiguration().BuildAsync();
+            Machines = machines.Select(x => new MachineModel()
             {
                 Guid = x.Guid,
                 Name = x.Name,
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs
index 2dd444f0f..03c87a3a6 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs
@@ -129,6 +129,20 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
             }
         }
 
+        private ObservableCollection<BtsrApplicationType> _btsrApplicationTypes;
+        public ObservableCollection<BtsrApplicationType> BtsrApplicationTypes
+        {
+            get { return _btsrApplicationTypes; }
+            set { _btsrApplicationTypes = value; RaisePropertyChangedAuto(); }
+        }
+
+        private ObservableCollection<BtsrYarnType> _btsrYarnTypes;
+        public ObservableCollection<BtsrYarnType> BtsrYarnTypes
+        {
+            get { return _btsrYarnTypes; }
+            set { _btsrYarnTypes = value; RaisePropertyChangedAuto(); }
+        }
+
         #endregion
 
         #region Commands
@@ -281,6 +295,11 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
 
                 using (_notification.PushTaskItem("Loading Test Results Parameters ..."))
                 {
+                    
+                    BtsrApplicationTypes = _active_context.BtsrApplicationTypes.ToObservableCollection();
+                    
+                    BtsrYarnTypes = _active_context.BtsrYarnTypes.ToObservableCollection();
+
                     var testResults = await new RMLExtensionTestResultsCollectionBuilder(_active_context).SetAll().ForRMLExtension(RMLExtemtionGUID).ForMachine(SelectedMachineGUID).WithRubbingAndTensileResults().WithTestResultsFiles().WithWashingTestResults().BuildAsync();
                     SelectedTestResults = testResults.OrderBy(x => x.ResultIndex).ToSynchronizedObservableCollection();
                     foreach (var result in SelectedTestResults)