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

Improved lots of the timing code in UIThread callbacks.

Browse source
This commit is contained in:
Lars Brubaker 2014-12-18 18:18:11 -08:00
parent ce2eb042c8
commit 4fcb81d555
4 changed files with 8 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

35
CustomWidgets/PrintProgressBarWidget.cs
View file

@ -14,7 +14,6 @@ namespace MatterHackers.MatterControl
public class PrintProgressBar : GuiWidget
{
double currentPercent = 0;
Stopwatch timeSinceLastUpdate = new Stopwatch();
RGBA_Bytes completeColor = new RGBA_Bytes(255, 255, 255);
TextWidget printTimeRemaining;
TextWidget printTimeElapsed;
@ -66,7 +65,6 @@ namespace MatterHackers.MatterControl
event EventHandler unregisterEvents;
void AddHandlers()
{
PrinterConnectionAndCommunication.Instance.WroteLine.RegisterEvent(Instance_WroteLine, ref unregisterEvents);
PrinterConnectionAndCommunication.Instance.ActivePrintItemChanged.RegisterEvent(Instance_PrintItemChanged, ref unregisterEvents);
PrinterConnectionAndCommunication.Instance.CommunicationStateChanged.RegisterEvent(Instance_PrintItemChanged, ref unregisterEvents);
ActiveTheme.Instance.ThemeChanged.RegisterEvent(ThemeChanged, ref unregisterEvents);
@ -105,40 +103,14 @@ namespace MatterHackers.MatterControl
UpdatePrintStatus();
}
void Instance_WroteLine(object sender, EventArgs e)
{
if (!timeSinceLastUpdate.IsRunning)
{
timeSinceLastUpdate.Start();
}
if (timeSinceLastUpdate.ElapsedMilliseconds > 999)
{
timeSinceLastUpdate.Restart();
currentPercent = PrinterConnectionAndCommunication.Instance.PercentComplete;
UpdatePrintStatus();
this.Invalidate();
}
}
void OnIdle(object state)
{
if (!timeSinceLastUpdate.IsRunning)
{
timeSinceLastUpdate.Start();
}
if (timeSinceLastUpdate.ElapsedMilliseconds > 999)
{
timeSinceLastUpdate.Restart();
currentPercent = PrinterConnectionAndCommunication.Instance.PercentComplete;
UpdatePrintStatus();
}
currentPercent = PrinterConnectionAndCommunication.Instance.PercentComplete;
UpdatePrintStatus();
if (!WidgetHasBeenClosed)
{
UiThread.RunOnIdle(OnIdle);
UiThread.RunOnIdle(OnIdle, 1);
}
}
@ -149,7 +121,6 @@ namespace MatterHackers.MatterControl
printTimeElapsed.Text = string.Format("");
printTimeRemaining.Text = string.Format("");
}
else
{
int secondsPrinted = PrinterConnectionAndCommunication.Instance.SecondsPrinted;