From bbfdb1f908634c799d62b33927115f41f0f7d731 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Wed, 20 Mar 2019 23:49:20 -0700 Subject: [PATCH 1/3] Add missing else qualifier - Issue MatterHackers/MCCentral#5192 DetailedPrintState oscillates between modes - Issue MatterHackers/MCCentral#5179 Many independent heating tasks started --- MatterControlLib/PrinterCommunication/PrinterConnection.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MatterControlLib/PrinterCommunication/PrinterConnection.cs b/MatterControlLib/PrinterCommunication/PrinterConnection.cs index 47e3218cc..6fbb80dd0 100644 --- a/MatterControlLib/PrinterCommunication/PrinterConnection.cs +++ b/MatterControlLib/PrinterCommunication/PrinterConnection.cs @@ -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(); From b6cddc21097043faac5f5cc36b7b81437f6328b8 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Wed, 20 Mar 2019 23:50:56 -0700 Subject: [PATCH 2/3] Use expected backing field naming --- .../PrinterCommunication/PrinterConnection.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MatterControlLib/PrinterCommunication/PrinterConnection.cs b/MatterControlLib/PrinterCommunication/PrinterConnection.cs index 6fbb80dd0..4a6785bc2 100644 --- a/MatterControlLib/PrinterCommunication/PrinterConnection.cs +++ b/MatterControlLib/PrinterCommunication/PrinterConnection.cs @@ -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); } } From e79739e82ad19572c44ef9e3d9dee49161bb0e99 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Wed, 20 Mar 2019 23:59:45 -0700 Subject: [PATCH 3/3] Remove 'On' nomenclature from event listener names --- .../ControlWidgets/TemperatureControls.cs | 10 +++++----- .../PrinterControls/ManualPrinterControls.cs | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/MatterControlLib/PrinterControls/ControlWidgets/TemperatureControls.cs b/MatterControlLib/PrinterControls/ControlWidgets/TemperatureControls.cs index 998007be4..49f4d43e9 100644 --- a/MatterControlLib/PrinterControls/ControlWidgets/TemperatureControls.cs +++ b/MatterControlLib/PrinterControls/ControlWidgets/TemperatureControls.cs @@ -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); diff --git a/MatterControlLib/PrinterControls/ManualPrinterControls.cs b/MatterControlLib/PrinterControls/ManualPrinterControls.cs index bcb05645e..5567113f5 100644 --- a/MatterControlLib/PrinterControls/ManualPrinterControls.cs +++ b/MatterControlLib/PrinterControls/ManualPrinterControls.cs @@ -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);