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

Progress bar for temp and time.

Browse source
This commit is contained in:
Lars Brubaker 2016-12-05 15:05:09 -08:00
parent 900b492a4b
commit 1876422bd9
2 changed files with 88 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

125
ConfigurationPage/RunningMacroPage.cs
View file

@ -27,29 +27,27 @@ of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using MatterHackers.Localizations;
using MatterHackers.Agg.UI;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using MatterHackers.MatterControl.SlicerConfiguration;
using MatterHackers.MatterControl.CustomWidgets;
using MatterHackers.Agg;
using MatterHackers.Agg.UI;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.CustomWidgets;
using MatterHackers.MatterControl.PrinterCommunication;
using MatterHackers.MatterControl.SlicerConfiguration;
namespace MatterHackers.MatterControl.PrinterControls
{
public class RunningMacroPage : WizardPage
{
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, expectedSeconds, expectedTemperature));
}
private long endTimeMs;
private ProgressBar progressBar;
private TextWidget progressBarText;
private long timeToWaitMs;
public RunningMacroPage(string message, bool showOkButton, bool showMaterialSelector, double expectedSeconds, double expectedTemperature)
: base("Close", "Macro Feedback")
: base("Close", "Macro Feedback")
{
TextWidget syncingText = new TextWidget(message, textColor: ActiveTheme.Instance.PrimaryTextColor);
contentRow.AddChild(syncingText);
@ -57,45 +55,44 @@ namespace MatterHackers.MatterControl.PrinterControls
footerRow.AddChild(new HorizontalSpacer());
footerRow.AddChild(cancelButton);
if(showMaterialSelector)
if (showMaterialSelector)
{
int extruderIndex = 0;
contentRow.AddChild(new PresetSelectorWidget(string.Format($"{"Material".Localize()} {extruderIndex + 1}"), RGBA_Bytes.Orange, NamedSettingsLayers.Material, extruderIndex));
}
var holder = new FlowLayoutWidget();
progressBar = new ProgressBar((int)(150 * GuiWidget.DeviceScale), (int)(15 * GuiWidget.DeviceScale))
{
FillColor = ActiveTheme.Instance.PrimaryAccentColor,
BorderColor = ActiveTheme.Instance.PrimaryTextColor,
//HAnchor = HAnchor.ParentCenter,
Margin = new BorderDouble(5, 0, 0, 10),
};
progressBarText = new TextWidget("", pointSize: 10, textColor: ActiveTheme.Instance.PrimaryTextColor)
{
AutoExpandBoundsToText = true,
Margin = new BorderDouble(5, 0, 0, 0),
};
holder.AddChild(progressBar);
holder.AddChild(progressBarText);
contentRow.AddChild(holder);
progressBar.Visible = false;
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);
timeToWaitMs = (long)(expectedSeconds * 1000);
endTimeMs = UiThread.CurrentTimerMs + timeToWaitMs;
UiThread.RunOnIdle(CountDownTime, 1);
progressBar.Visible = true;
}
if (expectedTemperature > 0)
{
}
PrinterConnectionAndCommunication.Instance.WroteLine.RegisterEvent(LookForTempRequest, ref unregisterEvents);
if (showOkButton)
{
Button okButton = textImageButtonFactory.Generate("Continue".Localize());
okButton.Margin = new BorderDouble(0,0,0,25);
okButton.Margin = new BorderDouble(0, 0, 0, 25);
okButton.HAnchor = HAnchor.ParentCenter;
okButton.Click += (s, e) =>
@ -108,10 +105,58 @@ namespace MatterHackers.MatterControl.PrinterControls
}
}
private event EventHandler unregisterEvents;
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, expectedSeconds, expectedTemperature));
}
public override void OnClosed(EventArgs e)
{
PrinterConnectionAndCommunication.Instance.MacroContinue();
unregisterEvents?.Invoke(this, null);
base.OnClosed(e);
}
private void CountDownTime()
{
long timeWaitedMs = endTimeMs - UiThread.CurrentTimerMs;
double ratioDone = 1 - ((double)timeWaitedMs / (double)timeToWaitMs);
progressBar.RatioComplete = Math.Min(Math.Max(0, ratioDone), 1);
int seconds = (int)((timeToWaitMs * (1 - ratioDone)) / 1000);
progressBarText.Text = $"Time Remaining: {seconds / 60:#0}:{seconds % 60:00}";
if (!HasBeenClosed && ratioDone < 1)
{
UiThread.RunOnIdle(CountDownTime, 1);
}
}
double startingTemp;
private void LookForTempRequest(object sender, EventArgs e)
{
var stringEvent = e as StringEventArgs;
if(stringEvent != null
&& stringEvent.Data.Contains("M104"))
{
startingTemp = PrinterConnectionAndCommunication.Instance.GetActualExtruderTemperature(0);
UiThread.RunOnIdle(ShowTempChangeProgress, 1);
progressBar.Visible = true;
}
}
private void ShowTempChangeProgress()
{
double totalDelta = PrinterConnectionAndCommunication.Instance.GetTargetExtruderTemperature(0) - startingTemp;
double currentDelta = PrinterConnectionAndCommunication.Instance.GetActualExtruderTemperature(0) - startingTemp;
double ratioDone = (currentDelta / totalDelta);
progressBar.RatioComplete = Math.Min(Math.Max(0, ratioDone), 1);
//progressBarText.Text = $"Time Remaining: {seconds / 60:#0}:{seconds % 60:00}";
if (!HasBeenClosed && ratioDone < 1)
{
UiThread.RunOnIdle(ShowTempChangeProgress, 1);
}
}
}
}
}