Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 12 insertions, 1 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ConnectedMachineViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ConnectedMachineViewVM.cs
index 8034ceb69..35a4b0e9d 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ConnectedMachineViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ConnectedMachineViewVM.cs
@@ -5,6 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Tango.BL.Entities;
 using Tango.Core.Commands;
+using Tango.MachineStudio.Common.Diagnostics;
 using Tango.MachineStudio.Common.Notifications;
 using Tango.MachineStudio.Common.StudioApplication;
 using Tango.SharedUI;
@@ -30,18 +31,28 @@ namespace Tango.MachineStudio.UI.ViewModels
 
         public ConnectedMachineVMResult Result { get; set; }
 
+        private IDiagnosticsFrameProvider _diagnosticsFrameProvider;
+        public IDiagnosticsFrameProvider DiagnosticsFrameProvider
+        {
+            get { return _diagnosticsFrameProvider; }
+            set { _diagnosticsFrameProvider = value; RaisePropertyChangedAuto(); }
+        }
+
+
         public RelayCommand DisconnectCommand { get; set; }
 
         public RelayCommand UploadHardwareConfigurationCommand { get; set; }
 
         public RelayCommand ResetCommand { get; set; }
 
-        public ConnectedMachineViewVM(IStudioApplicationManager application)
+        public ConnectedMachineViewVM(IStudioApplicationManager application, IDiagnosticsFrameProvider frameProvider)
         {
             ApplicationManager = application;
             DisconnectCommand = new RelayCommand(Disconnect);
             UploadHardwareConfigurationCommand = new RelayCommand(UploadHardwareConfiguration);
             ResetCommand = new RelayCommand(Reset);
+
+            DiagnosticsFrameProvider = frameProvider;
         }
 
         private void Reset()