nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

EnableChanged -> EventHandler

Browse source
This commit is contained in:
Lars Brubaker 2018-11-09 14:02:11 -08:00
parent 44a019d95c
commit e69591a884
4 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterConnectButton.cs
View file

@ -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)
{

4
MatterControlLib/PrinterCommunication/PrinterConnection.cs
View file

@ -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)

3
MatterControlLib/PrinterControls/ControlWidgets/CalibrationControls.cs
View file

@ -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();
}

3
MatterControlLib/PrinterControls/ManualPrinterControls.cs
View file

@ -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();
}