From 23d7dedee760796ebf7b86deb5e5986252dbc63a Mon Sep 17 00:00:00 2001 From: John Lewin Date: Tue, 14 Nov 2017 14:02:56 -0800 Subject: [PATCH] Remove coupling to PrintItemWrapper, revise naming to follow suite --- PrinterCommunication/Io/PauseHandlingStream.cs | 4 ++-- PrinterCommunication/PrinterConnection.cs | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/PrinterCommunication/Io/PauseHandlingStream.cs b/PrinterCommunication/Io/PauseHandlingStream.cs index 403314a3b..5cf38883a 100644 --- a/PrinterCommunication/Io/PauseHandlingStream.cs +++ b/PrinterCommunication/Io/PauseHandlingStream.cs @@ -105,12 +105,12 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io case PauseReason.PauseLayerReached: case PauseReason.GCodeRequest: - printer.Connection.PauseOnLayer.CallEvents(printer.Connection, new PrintItemWrapperEventArgs(printer.Bed.printItem)); + printer.Connection.PauseOnLayer.CallEvents(printer.Connection, new NamedItemEventArgs(printer.Bed.EditContext.SourceItem.Name)); UiThread.RunOnIdle(() => StyledMessageBox.ShowMessageBox(ResumePrint, layerPauseMessage.FormatWith(layerNumber), pauseCaption, StyledMessageBox.MessageType.YES_NO, "Ok".Localize(), "Resume".Localize())); break; case PauseReason.FilamentRunout: - printer.Connection.FilamentRunout.CallEvents(printer.Connection, new PrintItemWrapperEventArgs(printer.Bed.printItem)); + printer.Connection.FilamentRunout.CallEvents(printer.Connection, new NamedItemEventArgs(printer.Bed.EditContext.SourceItem.Name)); UiThread.RunOnIdle(() => StyledMessageBox.ShowMessageBox(ResumePrint, filamentPauseMessage, pauseCaption, StyledMessageBox.MessageType.YES_NO, "Ok".Localize(), "Resume".Localize())); break; } diff --git a/PrinterCommunication/PrinterConnection.cs b/PrinterCommunication/PrinterConnection.cs index e664c6fa8..8e09b5542 100644 --- a/PrinterCommunication/PrinterConnection.cs +++ b/PrinterCommunication/PrinterConnection.cs @@ -473,7 +473,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication // Set this early as we always want our functions to know the state we are in. communicationState = value; timeSinceStartedPrint.Stop(); - PrintFinished.CallEvents(this, new PrintItemWrapperEventArgs(printer.Bed.printItem)); + PrintFinished.CallEvents(this, new NamedItemEventArgs(printer.Bed.EditContext.SourceItem.Name)); // clear single use setting on print completion foreach (var keyValue in printer.Settings.BaseLayer) @@ -2846,14 +2846,14 @@ namespace MatterHackers.MatterControl.PrinterCommunication } } - public class PrintItemWrapperEventArgs : EventArgs + public class NamedItemEventArgs : EventArgs { - public PrintItemWrapperEventArgs(PrintItemWrapper printItemWrapper) + public NamedItemEventArgs(string name) { - this.PrintItemWrapper = printItemWrapper; + this.ItemName = name; } - public PrintItemWrapper PrintItemWrapper { get; } + public string ItemName { get; } } ///