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

Consolidate slicing behavior into SliceButton, disable during slice

Browse source 
- Issue MatterHackers/MCCentral#2398
Disable slice button while slicing
This commit is contained in:
John Lewin 2017-12-20 15:43:47 -08:00
parent 2594ffa7c3
commit 46ab447b44
2 changed files with 53 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

46
PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs
View file

@ -56,8 +56,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
private PrinterTabPage printerTabPage;
internal GuiWidget sliceButton;
private bool activelySlicing;
public PrinterActionsBar(PrinterConfig printer, PrinterTabPage printerTabPage, ThemeConfig theme)
{
this.printer = printer;
@ -84,21 +82,13 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
this.AddChild(new PrinterConnectButton(printer, theme));
this.AddChild(new PrintButton(printerTabPage, printer, theme));
var sliceButton = new SliceButton(printer, theme)
var sliceButton = new SliceButton(printer, printerTabPage, theme)
{
Name = "Generate Gcode Button",
BackgroundColor = theme.ButtonFactory.Options.NormalFillColor,
HoverColor = theme.ButtonFactory.Options.HoverFillColor,
Margin = theme.ButtonSpacing,
};
sliceButton.Click += async (s, e) =>
{
if (!activelySlicing)
{
await this.SliceFileTask();
}
};
this.AddChild(sliceButton);
// put in the detail message
@ -152,40 +142,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
this.AddChild(overflowMenu);
}
public async Task SliceFileTask()
{
if (printer.Settings.PrinterSelected)
{
if (printer.Settings.IsValid() && printer.Bed.EditContext.SourceItem != null)
{
activelySlicing = true;
try
{
await ApplicationController.Instance.Tasks.Execute(printerTabPage.view3DWidget.SaveChanges);
await ApplicationController.Instance.SliceFileLoadOutput(
printer,
printer.Bed.EditContext.PartFilePath,
printer.Bed.EditContext.GCodeFilePath);
}
catch (Exception ex)
{
Console.WriteLine("Error slicing file: " + ex.Message);
}
activelySlicing = false;
};
}
else
{
UiThread.RunOnIdle(() =>
{
StyledMessageBox.ShowMessageBox("Oops! Please select a printer in order to continue slicing.", "Select Printer", StyledMessageBox.MessageType.OK);
});
}
}
public override void AddChild(GuiWidget childToAdd, int indexInChildrenList = -1)
{
childToAdd.VAnchor = VAnchor.Center;