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

Remove coupling to PrintItemWrapper, revise naming to follow suite

Browse source
This commit is contained in:
John Lewin 2017-11-14 14:02:56 -08:00
parent 2aba5f185d
commit 23d7dedee7
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
PrinterCommunication/Io/PauseHandlingStream.cs
View file

@ -105,12 +105,12 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
case PauseReason.PauseLayerReached: case PauseReason.PauseLayerReached:
case PauseReason.GCodeRequest: 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())); UiThread.RunOnIdle(() => StyledMessageBox.ShowMessageBox(ResumePrint, layerPauseMessage.FormatWith(layerNumber), pauseCaption, StyledMessageBox.MessageType.YES_NO, "Ok".Localize(), "Resume".Localize()));
break; break;
case PauseReason.FilamentRunout: 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())); UiThread.RunOnIdle(() => StyledMessageBox.ShowMessageBox(ResumePrint, filamentPauseMessage, pauseCaption, StyledMessageBox.MessageType.YES_NO, "Ok".Localize(), "Resume".Localize()));
break; break;
} }

10
PrinterCommunication/PrinterConnection.cs
View file

@ -473,7 +473,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication
// Set this early as we always want our functions to know the state we are in. // Set this early as we always want our functions to know the state we are in.
communicationState = value; communicationState = value;
timeSinceStartedPrint.Stop(); 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 // clear single use setting on print completion
foreach (var keyValue in printer.Settings.BaseLayer) 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; }
} }
/// <summary> /// <summary>