From e69591a8843bb3b13bbad91baeb7cf508b2ee437 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Fri, 9 Nov 2018 14:02:11 -0800 Subject: [PATCH] EnableChanged -> EventHandler --- .../View3D/PrinterBar/PrinterConnectButton.cs | 7 ++++++- MatterControlLib/PrinterCommunication/PrinterConnection.cs | 4 ++-- .../PrinterControls/ControlWidgets/CalibrationControls.cs | 3 ++- MatterControlLib/PrinterControls/ManualPrinterControls.cs | 3 ++- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterConnectButton.cs b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterConnectButton.cs index c23807636..dea30fc1b 100644 --- a/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterConnectButton.cs +++ b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterConnectButton.cs @@ -153,7 +153,12 @@ namespace MatterHackers.MatterControl.ActionBar printer.Connection.CommunicationStateChanged += CommunicationStateChanged; this.Closed += (s, e) => printer.Connection.CommunicationStateChanged -= CommunicationStateChanged; - printer.Connection.EnableChanged.RegisterEvent((s, e) => SetVisibleStates(), ref unregisterEvents); + void EnableChanged(object s, EventArgs e) + { + SetVisibleStates(); + } + printer.Connection.EnableChanged += EnableChanged; + this.Closed += (s, e) => printer.Connection.EnableChanged -= EnableChanged; void ConnectionFailed(object s, EventArgs e) { diff --git a/MatterControlLib/PrinterCommunication/PrinterConnection.cs b/MatterControlLib/PrinterCommunication/PrinterConnection.cs index 711a5d98c..c56656cb3 100644 --- a/MatterControlLib/PrinterCommunication/PrinterConnection.cs +++ b/MatterControlLib/PrinterCommunication/PrinterConnection.cs @@ -102,7 +102,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication public event EventHandler DestinationChanged; - public RootedObjectEventHandler EnableChanged = new RootedObjectEventHandler(); + public event EventHandler EnableChanged; public event EventHandler HotendTemperatureRead; @@ -2203,7 +2203,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication private void OnEnabledChanged(EventArgs e) { - EnableChanged.CallEvents(this, e); + EnableChanged?.Invoke(this, e); } private void OnHotendTemperatureRead(EventArgs e) diff --git a/MatterControlLib/PrinterControls/ControlWidgets/CalibrationControls.cs b/MatterControlLib/PrinterControls/ControlWidgets/CalibrationControls.cs index 3992c4ef3..dcb0df006 100644 --- a/MatterControlLib/PrinterControls/ControlWidgets/CalibrationControls.cs +++ b/MatterControlLib/PrinterControls/ControlWidgets/CalibrationControls.cs @@ -139,7 +139,8 @@ namespace MatterHackers.MatterControl.PrinterControls printer.Connection.CommunicationStateChanged += PrinterStatusChanged; this.Closed += (s, e) => printer.Connection.CommunicationStateChanged -= PrinterStatusChanged; - printer.Connection.EnableChanged.RegisterEvent(PrinterStatusChanged, ref unregisterEvents); + printer.Connection.EnableChanged += PrinterStatusChanged; + this.Closed += (s, e) => printer.Connection.EnableChanged -= PrinterStatusChanged; SetVisibleControls(); } diff --git a/MatterControlLib/PrinterControls/ManualPrinterControls.cs b/MatterControlLib/PrinterControls/ManualPrinterControls.cs index dc08740be..1eacad520 100644 --- a/MatterControlLib/PrinterControls/ManualPrinterControls.cs +++ b/MatterControlLib/PrinterControls/ManualPrinterControls.cs @@ -110,7 +110,8 @@ namespace MatterHackers.MatterControl printer.Connection.CommunicationStateChanged += onPrinterStatusChanged; this.Closed += (s, e) => printer.Connection.CommunicationStateChanged -= onPrinterStatusChanged; - printer.Connection.EnableChanged.RegisterEvent(onPrinterStatusChanged, ref unregisterEvents); + printer.Connection.EnableChanged += onPrinterStatusChanged; + this.Closed += (s, e) => printer.Connection.EnableChanged -= onPrinterStatusChanged; SetVisibleControls(); }