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

Sync variable and type names, use TerminalLog.WriteLine method

Browse source
This commit is contained in:
jlewin 2019-04-02 16:44:58 -07:00
parent e82da83a9f
commit f886eb6d63
2 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -70,7 +70,7 @@ namespace MatterHackers.MatterControl
if (PrinterLines.Count > maxLinesToBuffer)
{
Clear();
this.Clear();
}
}
@ -107,7 +107,7 @@ namespace MatterHackers.MatterControl
switch (args.Reason)
{
case ConnectionFailure.AlreadyConnected:
message = "You can only connect when not currently connected.".Localize();
message = "You can only connect when not currently connected".Localize();
break;
case ConnectionFailure.UnsupportedBaudRate:
message = "Unsupported Baud Rate".Localize();
@ -126,13 +126,10 @@ namespace MatterHackers.MatterControl
break;
}
WriteLine("Connection Failed".Localize() + ": " + message);
this.WriteLine("Connection Failed".Localize() + ": " + message);
}
OnLineAdded(
new TerminalLine(
"Lost connection to printer.",
TerminalLine.MessageDirection.ToTerminal));
this.WriteLine("Lost connection to printer");
}
public void Clear()
@ -142,8 +139,7 @@ namespace MatterHackers.MatterControl
PrinterLines.Clear();
}
OnLineAdded(
new TerminalLine("", TerminalLine.MessageDirection.ToTerminal));
this.WriteLine("");
}
public void Dispose()

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

@ -106,12 +106,12 @@ namespace MatterHackers.MatterControl
}
}
private void ConditionalyAddToVisible(TerminalLine lineData)
private void ConditionalyAddToVisible(TerminalLine terminalLine)
{
var line = lineData.Line;
var line = terminalLine.Line;
if (LineFilterFunction != null)
{
line = LineFilterFunction(lineData);
line = LineFilterFunction(terminalLine);
}
if (!string.IsNullOrEmpty(line))
@ -120,11 +120,11 @@ namespace MatterHackers.MatterControl
}
}
private void TerminalLog_LineAdded(object sender, TerminalLine lineData)
private void TerminalLog_LineAdded(object sender, TerminalLine terminalLine)
{
if (lineData.Line != null)
if (terminalLine.Line != null)
{
ConditionalyAddToVisible(lineData);
ConditionalyAddToVisible(terminalLine);
}
else // the list changed in some big way (probably cleared)
{
@ -137,7 +137,7 @@ namespace MatterHackers.MatterControl
public void RebuildFilteredList()
{
lock (locker)
{
{
visibleLines = new List<string>();
var allSourceLinesTemp = allSourceLines.ToArray();
foreach (var lineData in allSourceLinesTemp)