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

Re-wrote the load filament wizard as not a macro so we have more control over it

Browse source 
Added it to the setup steps

issue: MatterHackers/MCCentral#4429
Put in a loading filament as part of initial setup process
This commit is contained in:
Lars Brubaker 2018-11-02 16:14:37 -07:00
parent 6469cba676
commit 775f1982bd
68 changed files with 832 additions and 492 deletions
Download patch file Download diff file Expand all files Collapse all files

12
MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/HomePrinterPage.cs
View file

@ -34,12 +34,12 @@ using MatterHackers.MatterControl.SlicerConfiguration;
namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
{
public class HomePrinterPage : LevelingWizardPage
public class HomePrinterPage : PrinterSetupWizardPage
{
private EventHandler unregisterEvents;
private bool autoAdvance;
public HomePrinterPage(LevelingWizard context, string headerText, string instructionsText, bool autoAdvance)
public HomePrinterPage(PrinterSetupWizard context, string headerText, string instructionsText, bool autoAdvance)
: base(context, headerText, instructionsText)
{
this.autoAdvance = autoAdvance;
@ -68,7 +68,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
if (autoAdvance)
{
nextButton.Enabled = false;
NextButton.Enabled = false;
}
base.PageIsBecomingActive();
@ -79,11 +79,11 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
if(printer.Connection.DetailedPrintingState != DetailedPrintingState.HomingAxis)
{
unregisterEvents?.Invoke(this, null);
nextButton.Enabled = true;
NextButton.Enabled = true;
if (printer.Settings.Helpers.UseZProbe())
{
UiThread.RunOnIdle(() => nextButton.InvokeClick());
UiThread.RunOnIdle(() => NextButton.InvokeClick());
}
}
}
@ -91,7 +91,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
public override void PageIsBecomingInactive()
{
unregisterEvents?.Invoke(this, null);
nextButton.Enabled = true;
NextButton.Enabled = true;
base.PageIsBecomingInactive();
}