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

1 files changed, 15 insertions, 2 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs
index 2a851e007..fba49ced3 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs
@@ -6,8 +6,10 @@ using System.Threading.Tasks;
 using Tango.BL.Entities;
 using Tango.BL.Enumerations;
 using Tango.Core.Commands;
+using Tango.Core.DI;
 using Tango.Integration.Operation;
 using Tango.PPC.Common;
+using Tango.PPC.Common.Diagnostics;
 using Tango.PPC.Jobs;
 using Tango.PPC.Jobs.NavigationObjects;
 using Tango.PPC.Jobs.Views;
@@ -19,7 +21,11 @@ namespace Tango.PPC.UI.ViewModels
     {
         #region Properties
 
-        private JobHandler _handler;
+        [TangoInject]
+        public IDiagnosticsFrameProvider DefaultDiagnosticsFrameProvider { get; set; }
+        
+
+    private JobHandler _handler;
 
         private Job _job;
         /// <summary>
@@ -230,8 +236,15 @@ namespace Tango.PPC.UI.ViewModels
         {
             MachineProvider.MachineOperator.PrintingStarted += MachineOperator_PrintingStarted;
             MachineProvider.MachineOperator.PrintingEnded += MachineOperator_PrintingEnded;
+
+            //DefaultDiagnosticsFrameProvider.FrameReceived += DefaultDiagnosticsFrameProvider_FrameReceived;
         }
-        
+
+        private void DefaultDiagnosticsFrameProvider_FrameReceived(object sender, PMR.Diagnostics.StartDiagnosticsResponse e)
+        {
+            var frame = e;
+        }
+
         private void MachineOperator_PrintingStarted(object sender, PrintingEventArgs e)
         {
             _handler = e.JobHandler;