1 files changed, 10 insertions, 16 deletions

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 c60d5e4fa..24196a3f6 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
@@ -16,6 +16,7 @@ using Tango.Core.Commands;
 using Tango.Logging;
 using Tango.MachineStudio.Common;
 using Tango.MachineStudio.Common.Notifications;
+using Tango.MachineStudio.ThreadExtensions.Models;
 using Tango.Settings;
 using Tango.SharedUI;
 
@@ -73,23 +74,19 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
                 //EnableRenderingForSelectedTabGraphs();
             }
         }
-        /// <summary>
-        /// Gets or sets the machines providers.
-        /// </summary>
-        //public ISuggestionProvider MachinesProvider { get; set; }
 
-        protected Machine _selectedMachine;
+        protected string _selectedMachineGuid;
         /// <summary>
         /// Gets or sets the selected machine.
         /// </summary>
-        public Machine SelectedMachine
+        public String SelectedMachineGUID
         {
-            get { return _selectedMachine; }
+            get { return _selectedMachineGuid; }
             set
             {
-                if (value != null && _selectedMachine != value)
+                if (value != null && _selectedMachineGuid != value)
                 {
-                    _selectedMachine = value;
+                    _selectedMachineGuid = value;
                     SelectedMachineChanged();
                     RaisePropertyChangedAuto();
                     InvalidateRelayCommands();
@@ -236,9 +233,6 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
         {
             ResultTabs.Clear();
             SelectedTab = null;
-            var settings = SettingsManager.Default.GetOrCreate<MachineStudioSettings>();
-
-            SelectedMachine = ObservablesStaticCollections.Instance.Machines.SingleOrDefault(x => x.SerialNumber == settings.LastVirtualMachineSerialNumber);
         }
 
         private void SelectedMachineChanged()
@@ -249,7 +243,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
         }
         public async void LoadTestResults()
         {
-            if (SelectedMachine == null || SelectedMachine.Guid == null)
+            if (String.IsNullOrEmpty(SelectedMachineGUID))
             {
                 _notification.ShowWarning(LogManager.Log($" Please, select machine.", LogCategory.Warning));
                 return;
@@ -268,7 +262,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
 
                 using (_notification.PushTaskItem("Loading Test Results Parameters ..."))
                 {
-                    var testResults = await new RMLExtensionTestResultsCollectionBuilder(_active_context).SetAll().ForRMLExtension(RMLExtemtionGUID).ForMachine(SelectedMachine.Guid).WithRubbingAndTensileResults().BuildAsync();
+                    var testResults = await new RMLExtensionTestResultsCollectionBuilder(_active_context).SetAll().ForRMLExtension(RMLExtemtionGUID).ForMachine(SelectedMachineGUID).WithRubbingAndTensileResults().BuildAsync();
                     SelectedTestResults = testResults.OrderBy(x => x.ResultIndex).ToSynchronizedObservableCollection();
                     foreach (var result in SelectedTestResults)
                     {
@@ -301,7 +295,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
         private TestResultViewVM CreateNewTestResultVM(string name, int index)
         {
             TestResultViewVM newtab = new TestResultViewVM(_notification, _actionLogManager) {  ThreadName = ThreadName };
-            newtab.TestResult = new RmlExtensionTestResult() { RmlsExtensionsGuid = RMLExtemtionGUID, MachineGuid = SelectedMachine.Guid, ResultIndex = index, Name = name, BtsrMax = 0.0, BtsrMin = 0.0, DryerTemperature = 0, TunnelTemperature = 0, TunnelFlow = 0.0, TunnelAvgTemperature = 0.0, TensionHeadMax = 0.0,
+            newtab.TestResult = new RmlExtensionTestResult() { RmlsExtensionsGuid = RMLExtemtionGUID, MachineGuid = SelectedMachineGUID, ResultIndex = index, Name = name, BtsrMax = 0.0, BtsrMin = 0.0, DryerTemperature = 0, TunnelTemperature = 0, TunnelFlow = 0.0, TunnelAvgTemperature = 0.0, TensionHeadMax = 0.0,
             TensionHeadMin = 0.0, TensioinAfterDryerMax = 0.0, TensionAfterDryerMin = 0.0, TensionWinderMax = 0.0, TensionWinderMin = 0.0, PullerTensionMax = 0.0, PullerTensionMin = 0.0, ExitTensionMax = 0.0, ExitTensionMin = 0.0, SeverityZone1Max = 0.0, SeverityZone1Min = 0.0, SeverityZone2Max = 0.0, SeverityZone2Min = 0.0,
             RefLubVersion="", RefCof = 0.0, RefLub = 0.0, ThreadLubVersion = "", ThreadCof = 0.0, ThreadLub = 0.0, Conclusions="", Comment=""};
             var rubbingresults = new SynchronizedObservableCollection<RubbingResult>();
@@ -331,7 +325,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
 
         public async void Save()
         {
-            if (SelectedMachine == null || SelectedMachine.Guid == null)
+            if (String.IsNullOrEmpty(SelectedMachineGUID))
             {
                 _notification.ShowWarning(LogManager.Log($"Could not save Test Results. Please, select machine.", LogCategory.Warning));
                 return;