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

Remove null line signaling of log cleared, add LogCleared event

Browse source
This commit is contained in:
jlewin 2019-04-03 11:13:11 -07:00
parent 3aa386de49
commit 5ab02ea8c6
2 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

26
MatterControlLib/PrinterControls/TerminalWindow/TextScrollWidget.cs
View file

@ -54,11 +54,14 @@ namespace MatterHackers.MatterControl
public TextScrollWidget(PrinterConfig printer, List<TerminalLine> sourceLines)
{
this.printer = printer;
printer.Connection.TerminalLog.LineAdded += TerminalLog_LineAdded;
this.typeFacePrinter = new TypeFacePrinter("", new StyledTypeFace(ApplicationController.GetTypeFace(NamedTypeFace.Liberation_Mono), 12));
this.typeFacePrinter.DrawFromHintedCache = true;
this.allSourceLines = sourceLines;
this.visibleLines = sourceLines.Select(ld => ld.Line).ToList();
// Register listeners
printer.Connection.TerminalLog.LineAdded += this.TerminalLog_LineAdded;
printer.Connection.TerminalLog.LogCleared += this.TerminalLog_LogCleared;
}
public double Position0To1
@ -109,6 +112,7 @@ namespace MatterHackers.MatterControl
private void ConditionalyAddToVisible(TerminalLine terminalLine)
{
var line = terminalLine.Line;
if (LineFilterFunction != null)
{
line = LineFilterFunction(terminalLine);
@ -122,16 +126,13 @@ namespace MatterHackers.MatterControl
private void TerminalLog_LineAdded(object sender, TerminalLine terminalLine)
{
if (terminalLine.Line != null)
{
ConditionalyAddToVisible(terminalLine);
}
else // the list changed in some big way (probably cleared)
{
RebuildFilteredList();
}
this.ConditionalyAddToVisible(terminalLine);
this.Invalidate();
}
Invalidate();
private void TerminalLog_LogCleared(object sender, EventArgs e)
{
this.RebuildFilteredList();
}
public void RebuildFilteredList()
@ -156,7 +157,10 @@ namespace MatterHackers.MatterControl
public override void OnClosed(EventArgs e)
{
printer.Connection.TerminalLog.LineAdded -= TerminalLog_LineAdded;
// Unregister listeners
printer.Connection.TerminalLog.LineAdded -= this.TerminalLog_LineAdded;
printer.Connection.TerminalLog.LogCleared -= this.TerminalLog_LogCleared;
base.OnClosed(e);
}