Implemented resume job on PPC.

Fixed resume job on emulator.
Fixed an issue with PPC event logger.
Added getting ready status to machine operator.

1 files changed, 24 insertions, 1 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/EventLogging/DefaultEventLogger.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/EventLogging/DefaultEventLogger.cs
index d540e3fd3..25eb2df04 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/EventLogging/DefaultEventLogger.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/EventLogging/DefaultEventLogger.cs
@@ -79,6 +79,7 @@ namespace Tango.PPC.Common.EventLogging
             _machineProvider.MachineOperator.RequestSent += Machine_RequestSent;
             _machineProvider.MachineOperator.RequestFailed += Machine_RequestFailed;
             _machineProvider.MachineOperator.ResponseReceived += Machine_ResponseReceived;
+            _machineProvider.MachineOperator.StateChanged += MachineOperator_StateChanged;
         }
 
         #endregion
@@ -114,6 +115,20 @@ namespace Tango.PPC.Common.EventLogging
         #region Event Handlers
 
         /// <summary>
+        /// Handles the machine operator state changed event.
+        /// </summary>
+        /// <param name="sender">The sender.</param>
+        /// <param name="e">The e.</param>
+        private void MachineOperator_StateChanged(object sender, Transport.TransportComponentState e)
+        {
+            if (e == Transport.TransportComponentState.Connected)
+            {
+                _events = new ConcurrentQueue<MachinesEvent>();
+                _currentEvents.Clear();
+            }
+        }
+
+        /// <summary>
         /// Handles the RequestSent event of the connected machine.
         /// </summary>
         /// <param name="sender">The sender.</param>
@@ -212,7 +227,15 @@ namespace Tango.PPC.Common.EventLogging
                 machineEvent.UserGuid = _authentication.CurrentUser.Guid;
                 machineEvent.User = _authentication.CurrentUser;
                 _events.Enqueue(machineEvent);
-                _currentEvents.Add(machineEvent);
+
+                if (!_currentEvents.Exists(x => x.Type == machineEvent.Type))
+                {
+                    if (machineEvent.Group != EventTypeGroups.Application && machineEvent.Group != EventTypeGroups.Transport)
+                    {
+                        _currentEvents.Add(machineEvent);
+                    }
+                }
+
                 EventReceived?.Invoke(this, machineEvent);
             }
         }