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

Putting progress bar on macro window.

Browse source
This commit is contained in:
larsbrubaker 2016-12-04 18:13:58 -08:00
parent 541e4ef7b1
commit 106a52b368
3 changed files with 41 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
PrinterCommunication/Io/QueuedCommandsStream.cs
View file

@ -36,6 +36,7 @@ using System.Text.RegularExpressions;
using MatterHackers.Agg.UI;
using System;
using MatterHackers.MatterControl.SlicerConfiguration;
using MatterHackers.GCodeVisualizer;
namespace MatterHackers.MatterControl.PrinterCommunication.Io
{
@ -110,7 +111,11 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
case "Message":
if (messages.Count > 0)
{
UiThread.RunOnIdle(() => RunningMacroPage.Show(messages[0]));
double seconds = 0;
GCodeFile.GetFirstNumberAfter("ExpectedSeconds:", lineToSend, ref seconds);
double temperature = 0;
GCodeFile.GetFirstNumberAfter("ExpectedTemperature:", lineToSend, ref temperature);
UiThread.RunOnIdle(() => RunningMacroPage.Show(messages[0], expectedSeconds: seconds, ExpectedTemperature: temperature));
}
break;