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

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

@ -40,7 +40,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
{
protected Vector3 probeStartPosition;
public GetCoarseBedHeight(LevelingWizard context, Vector3 probeStartPosition, string pageDescription, List<ProbePosition> probePositions,
public GetCoarseBedHeight(PrinterSetupWizard context, Vector3 probeStartPosition, string pageDescription, List<ProbePosition> probePositions,
int probePositionsBeingEditedIndex, LevelingStrings levelingStrings)
: base(context, pageDescription, "Using the [Z] controls on this screen, we will now take a coarse measurement of the extruder height at this position.".Localize(),
levelingStrings.CoarseInstruction2, 1, probePositions, probePositionsBeingEditedIndex)
@ -68,7 +68,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
printer.Connection.MoveAbsolute(probeStartPosition, feedRates.X);
printer.Connection.ReadPosition();
nextButton.Enabled = false;
NextButton.Enabled = false;
zPlusControl.Click += zControl_Click;
zMinusControl.Click += zControl_Click;
@ -76,12 +76,12 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
protected void zControl_Click(object sender, EventArgs mouseEvent)
{
nextButton.Enabled = true;
NextButton.Enabled = true;
}
public override void PageIsBecomingInactive()
{
nextButton.Enabled = true;
NextButton.Enabled = true;
base.PageIsBecomingInactive();
}