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

3
ApplicationView/MenuRow/MenuOptionMacros.cs
View file

@ -19,7 +19,8 @@ namespace MatterHackers.MatterControl
{
Name = "Macro Menu";
ActiveSliceSettings.ActivePrinterChanged.RegisterEvent((s,e) => SetEnabledState(), ref unregisterEvents);
ActiveSliceSettings.ActivePrinterChanged.RegisterEvent((s, e) => SetEnabledState(), ref unregisterEvents);
PrinterConnectionAndCommunication.Instance.CommunicationStateChanged.RegisterEvent((s,e) => SetEnabledState(), ref unregisterEvents);
}
public override void OnLoad(EventArgs args)

37
ConfigurationPage/RunningMacroPage.cs
View file

@ -43,12 +43,12 @@ namespace MatterHackers.MatterControl.PrinterControls
{
public class RunningMacroPage : WizardPage
{
public static void Show(string message, bool showOkButton = false, bool showMaterialSelector = false)
public static void Show(string message, bool showOkButton = false, bool showMaterialSelector = false, double expectedSeconds = 0, double expectedTemperature = 0)
{
WizardWindow.Show("Macro", "Running Macro", new RunningMacroPage(message, showOkButton, showMaterialSelector));
WizardWindow.Show("Macro", "Running Macro", new RunningMacroPage(message, showOkButton, showMaterialSelector, expectedSeconds, expectedTemperature));
}
public RunningMacroPage(string message, bool showOkButton, bool showMaterialSelector)
public RunningMacroPage(string message, bool showOkButton, bool showMaterialSelector, double expectedSeconds, double expectedTemperature)
: base("Close", "Macro Feedback")
{
TextWidget syncingText = new TextWidget(message, textColor: ActiveTheme.Instance.PrimaryTextColor);
@ -63,7 +63,36 @@ namespace MatterHackers.MatterControl.PrinterControls
contentRow.AddChild(new PresetSelectorWidget(string.Format($"{"Material".Localize()} {extruderIndex + 1}"), RGBA_Bytes.Orange, NamedSettingsLayers.Material, extruderIndex));
}
if(showOkButton)
if (expectedSeconds > 0)
{
long timeToWaitMs = (long)(expectedSeconds * 1000);
long endTimeMs = UiThread.CurrentTimerMs + timeToWaitMs;
ProgressBar progressBar = new ProgressBar((int)(150 * GuiWidget.DeviceScale), (int)(15 * GuiWidget.DeviceScale))
{
FillColor = ActiveTheme.Instance.PrimaryAccentColor,
//HAnchor = HAnchor.ParentCenter,
Margin = new BorderDouble(5, 0, 0, 10),
};
contentRow.AddChild(progressBar);
Action test = null;
test = () =>
{
long timeWaitedMs = endTimeMs - UiThread.CurrentTimerMs;
double ratioDone = 1 - ((double)timeWaitedMs / (double)timeToWaitMs);
progressBar.RatioComplete = Math.Min(ratioDone, 1);
if (!HasBeenClosed && ratioDone <= 1)
{
UiThread.RunOnIdle(test, 1);
}
};
UiThread.RunOnIdle(test, 1);
}
if (expectedTemperature > 0)
{
}
if (showOkButton)
{
Button okButton = textImageButtonFactory.Generate("Continue".Localize());
okButton.Margin = new BorderDouble(0,0,0,25);

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;