From 00a491d93733d4625ad329b2ba8237f445364b3f Mon Sep 17 00:00:00 2001
From: Mirta <mirta@twine-s.com>
Date: Wed, 30 Dec 2020 16:39:52 +0200
Subject: merge

---
 .../PPC/Tango.PPC.Common/PPCViewModel.cs           | 50 +---------------------
 1 file changed, 2 insertions(+), 48 deletions(-)

(limited to 'Software/Visual_Studio/PPC/Tango.PPC.Common/PPCViewModel.cs')

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCViewModel.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCViewModel.cs
index 98eef6883..5e584f891 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCViewModel.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCViewModel.cs
@@ -16,10 +16,7 @@ using Tango.PPC.Common.Navigation;
 using Tango.PPC.Common.Notifications;
 using Tango.PPC.Common.Printing;
 using Tango.PPC.Common.RemoteAssistance;
-using Tango.PPC.Common.RemoteDesktop;
 using Tango.PPC.Common.Storage;
-using Tango.PPC.Common.Synchronization;
-using Tango.PPC.Common.ThreadLoading;
 using Tango.Settings;
 using Tango.SharedUI;
 using static Tango.SharedUI.Controls.NavigationControl;
@@ -30,7 +27,7 @@ namespace Tango.PPC.Common
     /// Represents a PPC view model base class.
     /// </summary>
     /// <seealso cref="Tango.SharedUI.ViewModel" />
-    public abstract class PPCViewModel : ViewModel, INavigationBlocker
+    public abstract class PPCViewModel : ViewModel, INavigationViewModel, INavigationBlocker
     {
         /// <summary>
         /// Gets the static observable entities adapter.
@@ -112,24 +109,6 @@ namespace Tango.PPC.Common
         [TangoInject]
         public IEventLogger EventLogger { get; set; }
 
-        /// <summary>
-        /// Gets or sets the machine data synchronizer.
-        /// </summary>
-        [TangoInject]
-        public IMachineDataSynchronizer MachineDataSynchronizer { get; set; }
-
-        /// <summary>
-        /// Gets or sets the remote desktop service.
-        /// </summary>
-        [TangoInject]
-        public IRemoteDesktopService RemoteDesktopService { get; set; }
-
-        /// <summary>
-        /// Gets or sets the thread loading service.
-        /// </summary>
-        [TangoInject]
-        public IThreadLoadingService ThreadLoadingService { get; set; }
-
         private PPCSettings _settings;
         /// <summary>
         /// Gets the main PPC settings.
@@ -179,15 +158,6 @@ namespace Tango.PPC.Common
             IsVisible = true;
         }
 
-        /// <summary>
-        /// Called when the navigation system has navigated to this VM view.
-        /// </summary>
-        /// <param name="fromVM">The view model instance of the previous view model</param>
-        public virtual void OnNavigatedTo(PPCViewModel fromVM)
-        {
-            
-        }
-
         /// <summary>
         /// Called when the navigation system has navigated from this VM view.
         /// </summary>
@@ -196,22 +166,6 @@ namespace Tango.PPC.Common
             IsVisible = false;
         }
 
-        /// <summary>
-        /// Called before the navigation system has navigated to this VM view.
-        /// </summary>
-        public virtual void OnBeforeNavigatedTo()
-        {
-
-        }
-
-        /// <summary>
-        /// Called before the navigation system has navigated from this VM view.
-        /// </summary>
-        public virtual void OnBeforeNavigatedFrom()
-        {
-            IsVisible = false;
-        }
-
         /// <summary>
         /// Raises the specified message using the default <see cref="TangoMessenger"/>.
         /// </summary>
@@ -266,7 +220,7 @@ namespace Tango.PPC.Common
         /// </summary>
         public virtual void OnApplicationReady()
         {
-
+            
         }
     }
 
-- 
cgit v1.3.1