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

Merge pull request #4367 from jlewin/master

Browse source 
Add missing else qualifier
This commit is contained in:
johnlewin 2019-03-21 08:13:54 -07:00 • committed by GitHub
commit 6ec244de29
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

10
MatterControlLib/PrinterCommunication/PrinterConnection.cs
View file

@ -210,7 +210,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication
public CommunicationStates PrePauseCommunicationState { get; private set; } = CommunicationStates.Printing;
private DetailedPrintingState _printingStatePrivate;
private DetailedPrintingState _detailedPrintingState;
private ContainsStringLineActions ReadLineContainsCallBacks = new ContainsStringLineActions();
@ -758,12 +758,12 @@ namespace MatterHackers.MatterControl.PrinterCommunication
public DetailedPrintingState DetailedPrintingState
{
get => _printingStatePrivate;
get => _detailedPrintingState;
set
{
if (_printingStatePrivate != value)
if (_detailedPrintingState != value)
{
_printingStatePrivate = value;
_detailedPrintingState = value;
DetailedPrintingStateChanged?.Invoke(this, null);
}
}
@ -2354,7 +2354,7 @@ You will then need to logout and log back in to the computer for the changes to
timeSinceStartedPrint.Stop();
DetailedPrintingState = DetailedPrintingState.HeatingT0;
}
if (waitForTempStream?.HeatingT1 ?? false)
else if (waitForTempStream?.HeatingT1 ?? false)
{
// don't time the heating extruder operation
timeSinceStartedPrint.Stop();

10
MatterControlLib/PrinterControls/ControlWidgets/TemperatureControls.cs
View file

@ -117,8 +117,8 @@ namespace MatterHackers.MatterControl.PrinterControls
};
// Register listeners
printer.Connection.CommunicationStateChanged += onPrinterStatusChanged;
printer.Connection.EnableChanged += onPrinterStatusChanged;
printer.Connection.CommunicationStateChanged += Printer_StatusChanged;
printer.Connection.EnableChanged += Printer_StatusChanged;
SetVisibleControls();
}
@ -130,13 +130,13 @@ namespace MatterHackers.MatterControl.PrinterControls
public override void OnClosed(EventArgs e)
{
// Unregister listeners
printer.Connection.CommunicationStateChanged -= onPrinterStatusChanged;
printer.Connection.EnableChanged -= onPrinterStatusChanged;
printer.Connection.CommunicationStateChanged -= Printer_StatusChanged;
printer.Connection.EnableChanged -= Printer_StatusChanged;
base.OnClosed(e);
}
private void onPrinterStatusChanged(object sender, EventArgs e)
private void Printer_StatusChanged(object sender, EventArgs e)
{
SetVisibleControls();
UiThread.RunOnIdle(this.Invalidate);

14
MatterControlLib/PrinterControls/ManualPrinterControls.cs
View file

@ -112,9 +112,9 @@ namespace MatterHackers.MatterControl
UiThread.RunOnIdle(() => tuningAdjustmentControlsContainer.Width = tuningAdjustmentControlsContainer.Width + 1);
// Register listeners
printer.Connection.CommunicationStateChanged += OnPrinterStatusChanged;
printer.Connection.DetailedPrintingStateChanged += OnPrinterStatusChanged;
printer.Connection.EnableChanged += OnPrinterStatusChanged;
printer.Connection.CommunicationStateChanged += Printer_StatusChanged;
printer.Connection.DetailedPrintingStateChanged += Printer_StatusChanged;
printer.Connection.EnableChanged += Printer_StatusChanged;
SetVisibleControls();
}
@ -164,14 +164,14 @@ namespace MatterHackers.MatterControl
public override void OnClosed(EventArgs e)
{
// Unregister listeners
printer.Connection.CommunicationStateChanged -= OnPrinterStatusChanged;
printer.Connection.DetailedPrintingStateChanged -= OnPrinterStatusChanged;
printer.Connection.EnableChanged -= OnPrinterStatusChanged;
printer.Connection.CommunicationStateChanged -= Printer_StatusChanged;
printer.Connection.DetailedPrintingStateChanged -= Printer_StatusChanged;
printer.Connection.EnableChanged -= Printer_StatusChanged;
base.OnClosed(e);
}
private void OnPrinterStatusChanged(object sender, EventArgs e)
private void Printer_StatusChanged(object sender, EventArgs e)
{
SetVisibleControls();
UiThread.RunOnIdle(this.Invalidate);