1 files changed, 20 insertions, 9 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 88c50b549..91c80a41a 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
@@ -1,5 +1,4 @@
-using GalaSoft.MvvmLight.Ioc;
-using Google.Protobuf.Collections;
+using Google.Protobuf.Collections;
 using Microsoft.Win32;
 using RealTimeGraphEx.Controllers;
 using System;
@@ -30,6 +29,7 @@ using Tango.Integration.Services;
 using Tango.BL.Enumerations;
 using Tango.BL;
 using Tango.MachineStudio.Common.EventLogging;
+using Tango.MachineStudio.Common;
 
 namespace Tango.MachineStudio.Technician.ViewModels
 {
@@ -38,7 +38,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
     /// </summary>
     /// <seealso cref="Tango.SharedUI.ViewModel" />
     /// <seealso cref="Tango.MachineStudio.Common.StudioApplication.IShutdownListener" />
-    public class MachineTechViewVM : ViewModel, IShutdownListener
+    public class MachineTechViewVM : StudioViewModel<TechnicianModule>
     {
         private List<PropertyInfo> _diagnoticsMonitorsDataProperties;
         private Dictionary<SingleGraphItem, GraphController> _singleControllers;
@@ -49,6 +49,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
         private IEventLogger _eventLogger;
         private DateTime _lastDiagnosticsResponseUpdate;
         private const int MIN_DIAGNOSTICS_UPDATE_MILI = 500;
+        private bool _isViewLoaded;
 
         #region Properties
 
@@ -243,6 +244,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                 CurrentDiagnosticsResponseSize = data.CalculateSize();
             }
 
+
             lock (_elementsLock)
             {
                 var elements = Elements.ToList();
@@ -769,7 +771,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                 }
                 catch (Exception ex)
                 {
-                    LogManager.Log(ex, String.Format("Error executing technician command '{0}' on item '{1}'.", action,item.TechName));
+                    LogManager.Log(ex, String.Format("Error executing technician command '{0}' on item '{1}'.", action, item.TechName));
                     _eventLogger.Log(ex, String.Format("Error executing technician command '{0}' on item '{1}'.", action, item.TechName));
                 }
             };
@@ -1205,12 +1207,21 @@ namespace Tango.MachineStudio.Technician.ViewModels
 
         #endregion
 
-        #region IShutdownListener
+        #region IStudioModuleVM
 
-        /// <summary>
-        /// Called when the application is about to terminate.
-        /// </summary>
-        public void OnShuttingDown()
+        public override void OnNavigatedTo()
+        {
+            base.OnNavigatedTo();
+            _singleControllers.ToList().ForEach(x => x.Value.ChangeRenderMode(true));
+        }
+
+        public override void OnNavigatedFrom()
+        {
+            base.OnNavigatedFrom();
+            _singleControllers.ToList().ForEach(x => x.Value.ChangeRenderMode(false));
+        }
+
+        public override void OnShuttingDown()
         {
             InvokeUINow(() =>
             {