1 files changed, 32 insertions, 2 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingViewVM.cs
index bb503e718..c250c561b 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingViewVM.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Data.Entity;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -57,7 +58,7 @@ namespace Tango.PPC.UI.Dialogs
         public Rml SelectedRml
         {
             get { return _selectedRml; }
-            set { _selectedRml = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); }
+            set { _selectedRml = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); SetBTSRSpoolTension(); }
         }
 
         private ThreadLoadingStage _stage;
@@ -81,6 +82,20 @@ namespace Tango.PPC.UI.Dialogs
             set { _error = value; RaisePropertyChangedAuto(); }
         }
 
+        private int _btsrSpoolTension;
+        public int BtsrSpoolTension
+        {
+            get { return _btsrSpoolTension; }
+            set { _btsrSpoolTension = value; RaisePropertyChangedAuto(); }
+        }
+
+        private bool _btsrInstalled;
+        public bool BtsrInstalled
+        {
+            get { return _btsrInstalled; }
+            set { _btsrInstalled = value; RaisePropertyChangedAuto(); }
+        }
+
         public RelayCommand ContinueCommand { get; set; }
         public RelayCommand AbortCommand { get; set; }
 
@@ -95,6 +110,7 @@ namespace Tango.PPC.UI.Dialogs
             MachineProvider.MachineDisconnected += MachineProvider_MachineDisconnected;
 
             IsArcHead = MachineProvider.Machine.MachineHeadType == BL.Enumerations.HeadTypes.Arc;
+            BtsrInstalled = MachineProvider.Machine.BtsrInstalled;
 
             ContinueCommand = new RelayCommand(Continue, CanContinue);
             AbortCommand = new RelayCommand(Abort);
@@ -251,7 +267,7 @@ namespace Tango.PPC.UI.Dialogs
 
             using (ObservablesContext db = ObservablesContext.CreateDefault())
             {
-                rmls = await new RmlsCollectionBuilder(db).SetAll().ForHeadType(MachineProvider.Machine.MachineHeadType).ForSite(MachineProvider.Machine.SiteGuid).WithActiveParametersGroup().BuildListAsync();
+                rmls = await new RmlsCollectionBuilder(db).SetAll().WithSpools().ForHeadType(MachineProvider.Machine.MachineHeadType).ForSite(MachineProvider.Machine.SiteGuid).WithActiveParametersGroup().BuildListAsync();
             }
 
             var selectedRml = rmls.SingleOrDefault(x => x.Guid == _settings.LoadedRmlGuid);
@@ -260,6 +276,20 @@ namespace Tango.PPC.UI.Dialogs
             SelectedRml = selectedRml != null ? selectedRml : rmls.FirstOrDefault();
         }
 
+        private async void SetBTSRSpoolTension()
+        {
+            if (BtsrInstalled)
+            {
+                if (SelectedRml != null)
+                {
+                    using (ObservablesContext db = ObservablesContext.CreateDefault())
+                    {
+                        BtsrSpoolTension = await SelectedRml.GetRequiredBtsrSpoolTension(db);
+                    }
+                }
+            }
+        }
+
         protected override void Cancel()
         {
             CleanUp();