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

Rename TerminalLog.HasChanged to TerminalLog.LineAdded

Browse source
This commit is contained in:
jlewin 2019-04-02 15:06:50 -07:00
parent 0203290148
commit 59c2d13df1
2 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
MatterControlLib/PrinterControls/TerminalWindow/TerminalLog.cs
View file

@ -59,13 +59,14 @@ namespace MatterHackers.MatterControl
}
}
public event EventHandler<(string line, bool output)> HasChanged;
public event EventHandler<(string line, bool output)> LineAdded;
public List<(string line, bool output)> PrinterLines { get; } = new List<(string line, bool output)>();
private void OnHasChanged((string line, bool output) lineData)
private void OnLineAdded((string line, bool output) lineData)
{
HasChanged?.Invoke(this, lineData);
LineAdded?.Invoke(this, lineData);
if (PrinterLines.Count > maxLinesToBuffer)
{
Clear();
@ -75,13 +76,13 @@ namespace MatterHackers.MatterControl
private void Printer_LineReceived(object sender, string line)
{
PrinterLines.Add((line, false));
OnHasChanged((line, false));
OnLineAdded((line, false));
}
private void Printer_LineSent(object sender, string line)
{
PrinterLines.Add((line, true));
OnHasChanged((line, true));
OnLineAdded((line, true));
}
public void WriteLine(string line)
@ -92,12 +93,12 @@ namespace MatterHackers.MatterControl
public void WriteLine((string line, bool output) lineData)
{
PrinterLines.Add(lineData);
OnHasChanged(lineData);
OnLineAdded(lineData);
}
private void Instance_ConnectionFailed(object sender, EventArgs e)
{
OnHasChanged((null, true));
OnLineAdded((null, true));
if (e is ConnectFailedEventArgs args)
{
@ -127,17 +128,18 @@ namespace MatterHackers.MatterControl
StringEventArgs eventArgs = new StringEventArgs("Lost connection to printer.");
PrinterLines.Add((eventArgs.Data, true));
OnHasChanged((eventArgs.Data, true));
OnLineAdded((eventArgs.Data, true));
}
public void Clear()
{
lock(PrinterLines)
lock (PrinterLines)
{
PrinterLines.Clear();
}
OnHasChanged((null, true));
OnLineAdded((null, true));
}
public void Dispose()
{
@ -145,6 +147,8 @@ namespace MatterHackers.MatterControl
printerConnection.ConnectionFailed -= Instance_ConnectionFailed;
printerConnection.LineReceived -= Printer_LineReceived;
printerConnection.LineSent -= Printer_LineSent;
printerConnection = null;
}
}
}

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

@ -54,7 +54,7 @@ namespace MatterHackers.MatterControl
public TextScrollWidget(PrinterConfig printer, List<(string line, bool output)> sourceLines)
{
this.printer = printer;
printer.Connection.TerminalLog.HasChanged += RecievedNewLine;
printer.Connection.TerminalLog.LineAdded += RecievedNewLine;
this.typeFacePrinter = new TypeFacePrinter("", new StyledTypeFace(ApplicationController.GetTypeFace(NamedTypeFace.Liberation_Mono), 12));
this.typeFacePrinter.DrawFromHintedCache = true;
this.allSourceLines = sourceLines;
@ -156,7 +156,7 @@ namespace MatterHackers.MatterControl
public override void OnClosed(EventArgs e)
{
printer.Connection.TerminalLog.HasChanged -= RecievedNewLine;
printer.Connection.TerminalLog.LineAdded -= RecievedNewLine;
base.OnClosed(e);
}