From bd3cb640be12621ac37253e8a8c627ae40692e4d Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Thu, 7 Feb 2019 15:39:12 +0200
Subject: Some fixes and improvements for PPC & Machine Studio.

---
 .../EventLogging/DefaultEventLogger.cs             | 31 +++++-----------------
 1 file changed, 6 insertions(+), 25 deletions(-)

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

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 8e1f7c722..d540e3fd3 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/EventLogging/DefaultEventLogger.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/EventLogging/DefaultEventLogger.cs
@@ -73,7 +73,12 @@ namespace Tango.PPC.Common.EventLogging
             _logThread.IsBackground = true;
             _logThread.Start();
 
-            _machineProvider.MachineOperatorChanged += _machineProvider_MachineOperatorChanged;
+            _machineProvider.MachineOperator.MachineEventsStateProvider.NewEvents += MachineEventsStateProvider_NewEvents;
+            _machineProvider.MachineOperator.MachineEventsStateProvider.EventsResolved += MachineEventsStateProvider_EventsResolved;
+
+            _machineProvider.MachineOperator.RequestSent += Machine_RequestSent;
+            _machineProvider.MachineOperator.RequestFailed += Machine_RequestFailed;
+            _machineProvider.MachineOperator.ResponseReceived += Machine_ResponseReceived;
         }
 
         #endregion
@@ -108,30 +113,6 @@ namespace Tango.PPC.Common.EventLogging
 
         #region Event Handlers
 
-        private void _machineProvider_MachineOperatorChanged(object sender, MachineOperatorChangedEventArgs e)
-        {
-            var machine = e.MachineOperator;
-
-            if (machine != null)
-            {
-                if (machine.MachineEventsStateProvider != null)
-                {
-                    machine.MachineEventsStateProvider.NewEvents -= MachineEventsStateProvider_NewEvents;
-                    machine.MachineEventsStateProvider.NewEvents += MachineEventsStateProvider_NewEvents;
-                    machine.MachineEventsStateProvider.EventsResolved -= MachineEventsStateProvider_EventsResolved;
-                    machine.MachineEventsStateProvider.EventsResolved += MachineEventsStateProvider_EventsResolved;
-                }
-
-                machine.RequestSent -= Machine_RequestSent;
-                machine.RequestFailed -= Machine_RequestFailed;
-                machine.ResponseReceived -= Machine_ResponseReceived;
-
-                machine.RequestSent += Machine_RequestSent;
-                machine.RequestFailed += Machine_RequestFailed;
-                machine.ResponseReceived += Machine_ResponseReceived;
-            }
-        }
-
         /// <summary>
         /// Handles the RequestSent event of the connected machine.
         /// </summary>
-- 
cgit v1.3.1