merge

1 files changed, 14 insertions, 2 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
index 3864708fc..6303b1ac8 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
@@ -26,6 +26,7 @@ using Tango.MachineStudio.Common.Notifications;
 using Tango.MachineStudio.UI.Views;
 using Tango.Integration.Operation;
 using Tango.MachineStudio.UI.Windows;
+using Tango.MachineStudio.Common.JobRunsLogging;
 
 namespace Tango.MachineStudio.UI.StudioApplication
 {
@@ -39,15 +40,22 @@ namespace Tango.MachineStudio.UI.StudioApplication
         private INavigationManager _navigationManager;
         private IStudioModuleLoader _moduleLoader;
         private INotificationProvider _notification;
+        private IJobRunsLogger _jobRunsLogger;
         private List<Window> _openedWindows;
         private List<IStudioViewModel> _notified_view_models;
 
         /// <summary>
+        /// Occurs when the application is ready.
+        /// </summary>
+        public event EventHandler ApplicationReady;
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="DefaultStudioApplicationManager" /> class.
         /// </summary>
         /// <param name="navigationManager">The navigation manager.</param>
-        public DefaultStudioApplicationManager(INavigationManager navigationManager, IStudioModuleLoader moduleLoader, INotificationProvider notification)
+        public DefaultStudioApplicationManager(INavigationManager navigationManager, IStudioModuleLoader moduleLoader, INotificationProvider notification, IJobRunsLogger jobRunsLogger)
         {
+            _jobRunsLogger = jobRunsLogger;
             _moduleLoader = moduleLoader;
             _navigationManager = navigationManager;
             _notification = notification;
@@ -332,7 +340,7 @@ namespace Tango.MachineStudio.UI.StudioApplication
         /// </summary>
         public void NotifyApplicationReady()
         {
-            TangoIOC.Default.GetAllInstancesByBase<IStudioViewModel>().ToList().ForEach(x => 
+            TangoIOC.Default.GetAllInstancesByBase<IStudioViewModel>().ToList().ForEach(x =>
             {
                 if (!_notified_view_models.Contains(x))
                 {
@@ -340,6 +348,9 @@ namespace Tango.MachineStudio.UI.StudioApplication
                     _notified_view_models.Add(x);
                 }
             });
+
+            ApplicationReady?.Invoke(this, new EventArgs());
+            _jobRunsLogger.Init(this);
         }
 
         /// <summary>
@@ -360,5 +371,6 @@ namespace Tango.MachineStudio.UI.StudioApplication
                 ConnectedMachine = null;
             }
         }
+
     }
 }