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

Simplify Page access, pass page instance reference to PageLoad

Browse source
This commit is contained in:
John Lewin 2019-02-15 20:25:07 -08:00
parent 1b463ffaa7
commit 81678d9f8c
16 changed files with 40 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MatterControlLib/ConfigurationPage/PrintLeveling/LevelingStrings.cs
View file

@ -1,5 +1,5 @@
/*
Copyright (c) 2018, Lars Brubaker, John Lewin
Copyright (c) 2019, Lars Brubaker, John Lewin
All rights reserved.
Redistribution and use in source and binary forms, with or without

34
MatterControlLib/ConfigurationPage/PrintLeveling/LoadFilamentWizard.cs
View file

@ -1,5 +1,5 @@
/*
Copyright (c) 2018, Lars Brubaker, John Lewin
Copyright (c) 2019, Lars Brubaker, John Lewin
All rights reserved.
Redistribution and use in source and binary forms, with or without
@ -103,10 +103,9 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
// show the trim filament message
{
PrinterSetupWizardPage trimFilamentPage = null;
trimFilamentPage = new PrinterSetupWizardPage(this, "Trim Filament".Localize(), "")
var trimFilamentPage = new PrinterSetupWizardPage(this, "Trim Filament".Localize(), "")
{
PageLoad = () =>
PageLoad = (page) =>
{
// start heating up the extruder
printer.Connection.SetTargetHotendTemperature(extruderIndex, printer.Settings.GetValue<double>(SettingsKey.temperature));
@ -114,7 +113,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
var markdownText = printer.Settings.GetValue(SettingsKey.trim_filament_markdown);
var markdownWidget = new MarkdownWidget(theme);
markdownWidget.Markdown = markdownText = markdownText.Replace("\\n", "\n");
trimFilamentPage.ContentRow.AddChild(markdownWidget);
page.ContentRow.AddChild(markdownWidget);
}
};
yield return trimFilamentPage;
@ -132,10 +131,9 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
// show the insert filament page
{
RunningInterval runningGCodeCommands = null;
PrinterSetupWizardPage insertFilamentPage = null;
insertFilamentPage = new PrinterSetupWizardPage(this, "Insert Filament".Localize(), "")
var insertFilamentPage = new PrinterSetupWizardPage(this, "Insert Filament".Localize(), "")
{
PageLoad = () =>
PageLoad = (page) =>
{
var markdownText = printer.Settings.GetValue(SettingsKey.insert_filament_markdown2);
if(extruderIndex == 1)
@ -144,7 +142,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
}
var markdownWidget = new MarkdownWidget(theme);
markdownWidget.Markdown = markdownText = markdownText.Replace("\\n", "\n");
insertFilamentPage.ContentRow.AddChild(markdownWidget);
page.ContentRow.AddChild(markdownWidget);
// turn off the fan
printer.Connection.FanSpeed0To255 = 0;
@ -191,12 +189,11 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
// show the loading filament progress bar
{
RunningInterval runningGCodeCommands = null;
PrinterSetupWizardPage loadingFilamentPage = null;
loadingFilamentPage = new PrinterSetupWizardPage(this, "Loading Filament".Localize(), "")
var loadingFilamentPage = new PrinterSetupWizardPage(this, "Loading Filament".Localize(), "")
{
PageLoad = () =>
PageLoad = (page) =>
{
loadingFilamentPage.NextButton.Enabled = false;
page.NextButton.Enabled = false;
// add the progress bar
var holder = new FlowLayoutWidget()
@ -218,7 +215,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
};
holder.AddChild(progressBar);
holder.AddChild(progressBarText);
loadingFilamentPage.ContentRow.AddChild(holder);
page.ContentRow.AddChild(holder);
// Allow extrusion at any temperature. S0 only works on Marlin S1 works on repetier and marlin
printer.Connection.QueueLine("M302 S1");
@ -265,7 +262,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
&& remainingLengthMm <= .001)
{
UiThread.ClearInterval(runningGCodeCommands);
loadingFilamentPage.NextButton.InvokeClick();
page.NextButton.InvokeClick();
}
},
.1);
@ -303,10 +300,9 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
// extrude slowly so that we can prime the extruder
{
RunningInterval runningGCodeCommands = null;
PrinterSetupWizardPage runningCleanPage = null;
runningCleanPage = new PrinterSetupWizardPage(this, "Wait For Running Clean".Localize(), "")
var runningCleanPage = new PrinterSetupWizardPage(this, "Wait For Running Clean".Localize(), "")
{
PageLoad = () =>
PageLoad = (page) =>
{
var markdownText = printer.Settings.GetValue(SettingsKey.running_clean_markdown2);
if(extruderIndex == 1)
@ -315,7 +311,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
}
var markdownWidget = new MarkdownWidget(theme);
markdownWidget.Markdown = markdownText = markdownText.Replace("\\n", "\n");
runningCleanPage.ContentRow.AddChild(markdownWidget);
page.ContentRow.AddChild(markdownWidget);
var runningTime = Stopwatch.StartNew();
runningGCodeCommands = UiThread.SetInterval(() =>

2
MatterControlLib/ConfigurationPage/PrintLeveling/PrintLevelingWizard.cs
View file

@ -1,5 +1,5 @@
/*
Copyright (c) 2018, Lars Brubaker, John Lewin
Copyright (c) 2019, Lars Brubaker, John Lewin
All rights reserved.
Redistribution and use in source and binary forms, with or without

2
MatterControlLib/ConfigurationPage/PrintLeveling/PrinterSetupWizard.cs
View file

@ -1,5 +1,5 @@
/*
Copyright (c) 2018, Lars Brubaker, John Lewin
Copyright (c) 2019, Lars Brubaker, John Lewin
All rights reserved.
Redistribution and use in source and binary forms, with or without

12
MatterControlLib/ConfigurationPage/PrintLeveling/PrinterSetupWizardPage.cs
View file

@ -1,5 +1,5 @@
/*
Copyright (c) 2018, Lars Brubaker, John Lewin
Copyright (c) 2019, Lars Brubaker, John Lewin
All rights reserved.
Redistribution and use in source and binary forms, with or without
@ -40,8 +40,10 @@ namespace MatterHackers.MatterControl
public TextButton NextButton { get; }
protected PrinterConfig printer;
public Action PageLoad;
public Action PageClose;
public Action<PrinterSetupWizardPage> PageLoad { get; set; }
public Action PageClose { get; set; }
protected PrinterSetupWizard wizardContext;
public PrinterSetupWizardPage(PrinterSetupWizard wizardContext, string headerText, string instructionsText)
@ -70,8 +72,6 @@ namespace MatterHackers.MatterControl
this.AddPageAction(NextButton);
}
public GuiWidget ContentRow => contentRow;
protected GuiWidget CreateTextField(string text)
{
return new WrappedTextWidget(text)
@ -84,7 +84,7 @@ namespace MatterHackers.MatterControl
public override void OnLoad(EventArgs args)
{
this.PageLoad?.Invoke();
this.PageLoad?.Invoke(this);
base.OnLoad(args);
}

2
MatterControlLib/ConfigurationPage/PrintLeveling/ProbeCalibrationWizard.cs
View file

@ -1,5 +1,5 @@
/*
Copyright (c) 2018, Lars Brubaker, John Lewin
Copyright (c) 2019, Lars Brubaker, John Lewin
All rights reserved.
Redistribution and use in source and binary forms, with or without

13
MatterControlLib/ConfigurationPage/PrintLeveling/UnloadFilamentWizard.cs
View file

@ -1,5 +1,5 @@
/*
Copyright (c) 2018, Lars Brubaker, John Lewin
Copyright (c) 2019, Lars Brubaker, John Lewin
All rights reserved.
Redistribution and use in source and binary forms, with or without
@ -109,12 +109,11 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
int extruderPriorToUnload = printer.Connection.ActiveExtruderIndex;
RunningInterval runningGCodeCommands = null;
PrinterSetupWizardPage unloadingFilamentPage = null;
unloadingFilamentPage = new PrinterSetupWizardPage(this, "Unloading Filament".Localize(), "")
var unloadingFilamentPage = new PrinterSetupWizardPage(this, "Unloading Filament".Localize(), "")
{
PageLoad = () =>
PageLoad = (page) =>
{
unloadingFilamentPage.NextButton.Enabled = false;
page.NextButton.Enabled = false;
// add the progress bar
var holder = new FlowLayoutWidget()
@ -136,7 +135,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
};
holder.AddChild(progressBar);
holder.AddChild(progressBarText);
unloadingFilamentPage.ContentRow.AddChild(holder);
page.ContentRow.AddChild(holder);
if (extruderCount > 1)
{
@ -196,7 +195,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
&& remainingLengthMm <= .001)
{
UiThread.ClearInterval(runningGCodeCommands);
unloadingFilamentPage.NextButton.InvokeClick();
page.NextButton.InvokeClick();
}
},
.1);

2
MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/AutoProbeFeedback.cs
View file

@ -1,5 +1,5 @@
/*
Copyright (c) 2018, Lars Brubaker, John Lewin
Copyright (c) 2019, Lars Brubaker, John Lewin
All rights reserved.
Redistribution and use in source and binary forms, with or without

2
MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/CalibrateProbeLastPagelInstructions.cs
View file

@ -1,5 +1,5 @@
/*
Copyright (c) 2018, Lars Brubaker, John Lewin
Copyright (c) 2019, Lars Brubaker, John Lewin
All rights reserved.
Redistribution and use in source and binary forms, with or without

2
MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/FindBedHeight.cs
View file

@ -1,5 +1,5 @@
/*
Copyright (c) 2018, Lars Brubaker, John Lewin
Copyright (c) 2019, Lars Brubaker, John Lewin
All rights reserved.
Redistribution and use in source and binary forms, with or without

2
MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/GetCoarseBedHeight.cs
View file

@ -1,5 +1,5 @@
/*
Copyright (c) 2018, Lars Brubaker, John Lewin
Copyright (c) 2019, Lars Brubaker, John Lewin
All rights reserved.
Redistribution and use in source and binary forms, with or without

2
MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/GetFineBedHeight.cs
View file

@ -1,5 +1,5 @@
/*
Copyright (c) 2018, Lars Brubaker, John Lewin
Copyright (c) 2019, Lars Brubaker, John Lewin
All rights reserved.
Redistribution and use in source and binary forms, with or without

2
MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/GettingThirdPointFor2PointCalibration.cs
View file

@ -1,5 +1,5 @@
/*
Copyright (c) 2018, Lars Brubaker, John Lewin
Copyright (c) 2019, Lars Brubaker, John Lewin
All rights reserved.
Redistribution and use in source and binary forms, with or without

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

@ -1,5 +1,5 @@
/*
Copyright (c) 2018, Lars Brubaker, John Lewin
Copyright (c) 2019, Lars Brubaker, John Lewin
All rights reserved.
Redistribution and use in source and binary forms, with or without

2
MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/WaitForTempPage.cs
View file

@ -1,5 +1,5 @@
/*
Copyright (c) 2018, Lars Brubaker, John Lewin
Copyright (c) 2019, Lars Brubaker, John Lewin
All rights reserved.
Redistribution and use in source and binary forms, with or without

2
MatterControlLib/SetupWizard/DialogPage.cs
View file

@ -1,5 +1,5 @@
/*
Copyright (c) 2018, Lars Brubaker, John Lewin
Copyright (c) 2019, Lars Brubaker, John Lewin
All rights reserved.
Redistribution and use in source and binary forms, with or without