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

1 files changed, 13 insertions, 0 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs
index bec1d2b48..57fae7791 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs
@@ -11,6 +11,7 @@ using Tango.PPC.Common.Diagnostics;
 using Tango.PPC.Common.EventLogging;
 using Tango.PPC.Common.ExternalBridge;
 using Tango.PPC.Common.MachineSetup;
+using Tango.PPC.Common.MachineUpdate;
 using Tango.PPC.Common.Modules;
 using Tango.PPC.Common.Navigation;
 using Tango.PPC.Common.Notifications;
@@ -55,6 +56,7 @@ namespace Tango.PPC.UI
             TangoIOC.Default.Unregister<ITeamFoundationServiceClient>();
             TangoIOC.Default.Unregister<IPPCExternalBridgeService>();
             TangoIOC.Default.Unregister<IMachineSetupManager>();
+            TangoIOC.Default.Unregister<IMachineUpdateManager>();
             TangoIOC.Default.Unregister<IPrintingManager>();
             TangoIOC.Default.Unregister<IConnectivityProvider>();
 
@@ -70,6 +72,7 @@ namespace Tango.PPC.UI
             TangoIOC.Default.Register<IEventLogger, DefaultEventLogger>();
             TangoIOC.Default.Register<IPPCExternalBridgeService, PPCExternalBridgeService>();
             TangoIOC.Default.Register<IMachineSetupManager, MachineSetupManager>();
+            TangoIOC.Default.Register<IMachineUpdateManager, MachineUpdateManager>();
             TangoIOC.Default.Register<IPrintingManager, DefaultPrintingManager>();
             TangoIOC.Default.Register<IConnectivityProvider, DefaultConnectivityProvider>();
 
@@ -81,12 +84,14 @@ namespace Tango.PPC.UI
             TangoIOC.Default.Register<LayoutViewVM>();
             TangoIOC.Default.Register<ExternalBridgeViewVM>();
             TangoIOC.Default.Register<MachineSetupViewVM>();
+            TangoIOC.Default.Register<MachineUpdateViewVM>();
 
 
             TangoIOC.Default.GetInstance<IPPCApplicationManager>().ContentRendered += (_, __) =>
             {
                 TangoIOC.Default.Register<ILayoutView, LayoutView>(LayoutView.Instance);
                 TangoIOC.Default.Register<IMachineSetupView, MachineSetupView>(MachineSetupView.Instance);
+                TangoIOC.Default.Register<IMachineUpdateView, MachineUpdateView>(MachineUpdateView.Instance);
             };
 
             //TangoIOC.Default.Register<LoadingViewVM>();
@@ -145,5 +150,13 @@ namespace Tango.PPC.UI
                 return TangoIOC.Default.GetInstance<MachineSetupViewVM>();
             }
         }
+
+        public static MachineUpdateViewVM MachineUpdateViewVM
+        {
+            get
+            {
+                return TangoIOC.Default.GetInstance<MachineUpdateViewVM>();
+            }
+        }
     }
 }
\ No newline at end of file