From de099bd3b50b8ea52b212b8d322626582c2648be Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Sun, 22 Apr 2018 13:35:22 +0300 Subject: Implemented new TangoIOC container & TangoMessenger. Got rid of MVVMLite libs ! Got rid of IShutdownRequestBlocker, IShutdownListener, IModuleRequestListener. Implemented IStudioViewModel & StudioViewModel. --- .../ViewModels/MachineTechViewVM.cs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs') 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..c1dfe5f8c 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 /// /// /// - public class MachineTechViewVM : ViewModel, IShutdownListener + public class MachineTechViewVM : StudioViewModel { private List _diagnoticsMonitorsDataProperties; private Dictionary _singleControllers; @@ -1205,12 +1205,9 @@ namespace Tango.MachineStudio.Technician.ViewModels #endregion - #region IShutdownListener + #region IStudioModuleVM - /// - /// Called when the application is about to terminate. - /// - public void OnShuttingDown() + public override void OnShuttingDown() { InvokeUINow(() => { -- cgit v1.3.1