merge

2 files changed, 0 insertions, 25 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
index 2a0392dd6..95912e1ea 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
@@ -33,11 +33,6 @@ namespace Tango.PPC.Common.Connection
         private bool _isInitialized;
         private Thread _connection_thread;
 
-        /// <summary>
-        /// Occurs when current <see cref="IMachineOperator" /> has changed.
-        /// </summary>
-        public event EventHandler<MachineOperatorChangedEventArgs> MachineOperatorChanged;
-
         private Machine _machine;
         /// <summary>
         /// Gets the database machine entity associated with the current machine.
@@ -67,24 +62,12 @@ namespace Tango.PPC.Common.Connection
             }
             private set
             {
-                var oldOperator = _machineOperator;
                 _machineOperator = value;
-                OnMachineOperatorChanged(oldOperator, _machineOperator);
                 RaisePropertyChangedAuto();
             }
         }
 
         /// <summary>
-        /// Called when the machine operator has been changed
-        /// </summary>
-        /// <param name="oldOperator">The old operator.</param>
-        /// <param name="newOperator">The new operator.</param>
-        protected virtual void OnMachineOperatorChanged(IMachineOperator oldOperator, IMachineOperator newOperator)
-        {
-            MachineOperatorChanged?.Invoke(this, new MachineOperatorChangedEventArgs(oldOperator, newOperator));
-        }
-
-        /// <summary>
         /// Initializes a new instance of the <see cref="DefaultMachineProvider"/> class.
         /// </summary>
         public DefaultMachineProvider()
@@ -128,7 +111,6 @@ namespace Tango.PPC.Common.Connection
                                 MachineOperator.Adapter = response.Adapter;
                                 MachineOperator.JobHandlingMode = JobHandlerModes.SettingUp;
                                 LogManager.Log("Connecting machine operator...");
-                                MachineOperatorChanged?.Invoke(this, new MachineOperatorChangedEventArgs(MachineOperator, MachineOperator));
                                 await MachineOperator.Connect();
 
 
@@ -142,7 +124,6 @@ namespace Tango.PPC.Common.Connection
                                 UsbTransportAdapter adapter = new UsbTransportAdapter(settings.EmbeddedComPort, UsbSerialBaudRates.BR_115200);
                                 MachineOperator.Adapter = adapter;
                                 MachineOperator.JobHandlingMode = JobHandlerModes.SettingUp;
-                                MachineOperatorChanged?.Invoke(this, new MachineOperatorChangedEventArgs(MachineOperator, MachineOperator));
                                 await MachineOperator.Connect();
 
                                 await Task.Delay(1000);
@@ -165,7 +146,6 @@ namespace Tango.PPC.Common.Connection
                             MachineOperator.Adapter = adapter;
                             MachineOperator.JobHandlingMode = JobHandlerModes.SettingUp;
                             LogManager.Log("Connecting machine operator...");
-                            MachineOperatorChanged?.Invoke(this, new MachineOperatorChangedEventArgs(MachineOperator, MachineOperator));
                             await MachineOperator.Connect();
 
                             await Task.Delay(1000);
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/IMachineProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/IMachineProvider.cs
index df4a448f7..43a6c290e 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/IMachineProvider.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/IMachineProvider.cs
@@ -15,11 +15,6 @@ namespace Tango.PPC.Common.Connection
     public interface IMachineProvider
     {
         /// <summary>
-        /// Occurs when current <see cref="IMachineOperator"/> has changed.
-        /// </summary>
-        event EventHandler<MachineOperatorChangedEventArgs> MachineOperatorChanged;
-
-        /// <summary>
         /// Gets the database machine entity associated with the current machine.
         /// </summary>
         Machine Machine { get; }