Improved module popout..

1 files changed, 7 insertions, 22 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
index 6ccc1caa0..ad763fe54 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
@@ -18,6 +18,7 @@ using Tango.Editors;
 using Tango.Integration.Observables;
 using Tango.Integration.Observables.Enumerations;
 using Tango.Integration.Operators;
+using Tango.MachineStudio.Common.Diagnostics;
 using Tango.MachineStudio.Common.Notifications;
 using Tango.MachineStudio.Common.StudioApplication;
 using Tango.MachineStudio.Technician.Editors;
@@ -168,19 +169,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
         /// </summary>
         /// <param name="applicationManager">The application manager.</param>
         /// <param name="notificationProvider">The notification provider.</param>
-        [PreferredConstructor]
-        public MachineTechViewVM(IStudioApplicationManager applicationManager, INotificationProvider notificationProvider) : this(applicationManager, notificationProvider, true)
-        {
-
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MachineTechViewVM"/> class.
-        /// </summary>
-        /// <param name="applicationManager">The application manager.</param>
-        /// <param name="notificationProvider">The notification provider.</param>
-        /// <param name="loadLastProject">if set to <c>true</c> [load last project].</param>
-        public MachineTechViewVM(IStudioApplicationManager applicationManager, INotificationProvider notificationProvider, bool loadLastProject)
+        public MachineTechViewVM(IStudioApplicationManager applicationManager, INotificationProvider notificationProvider, IDiagnosticsFrameProvider _diagnosticsFrameProvider)
         {
             _notification = notificationProvider;
             _singleControllers = new Dictionary<SingleGraphItem, GraphController>();
@@ -200,10 +189,12 @@ namespace Tango.MachineStudio.Technician.ViewModels
 
             _lastTechProjectFile = SettingsManager.Default.MachineStudio.TechnicianModule.LasTechProjectFile;
 
-            if (File.Exists(_lastTechProjectFile) && loadLastProject)
+            if (File.Exists(_lastTechProjectFile))
             {
                 OpenProjectFile(_lastTechProjectFile);
             }
+
+            _diagnosticsFrameProvider.FrameReceived += DiagnosticsFrameProvider_FrameReceived;
         }
 
         #endregion
@@ -218,20 +209,14 @@ namespace Tango.MachineStudio.Technician.ViewModels
         private void ApplicationManager_ConnectedMachineChanged(object sender, Integration.Services.IExternalBridgeClient machine)
         {
             MachineOperator = machine;
-
-            if (MachineOperator != null)
-            {
-                MachineOperator.DiagnosticsDataAvailable -= MachineOperator_DiagnosticsDataAvailable;
-                MachineOperator.DiagnosticsDataAvailable += MachineOperator_DiagnosticsDataAvailable;
-            }
         }
 
         /// <summary>
-        /// Machines the operator diagnostics data available.
+        /// Handles the diagnostics frame provider data.
         /// </summary>
         /// <param name="sender">The sender.</param>
         /// <param name="response">The response.</param>
-        private void MachineOperator_DiagnosticsDataAvailable(object sender, PushDiagnosticsResponse response)
+        private void DiagnosticsFrameProvider_FrameReceived(object sender, PushDiagnosticsResponse response)
         {
             PopulateDiagnosticsData(response);
         }