Only advance to next unfinished stage, if started in that mode
- Issue MatterHackers/MCCentral#5496 Clicking 'already loaded' on extruder 2 does not make xy calibration available
This commit is contained in:
parent
415d5206e7
commit
60beceea6d
5 changed files with 10 additions and 1 deletions
|
|
@ -125,7 +125,8 @@ namespace MatterHackers.MatterControl
|
|||
|
||||
protected void FinishWizard()
|
||||
{
|
||||
if (this.DialogWindow is StagedSetupWindow setupWindow)
|
||||
if (this.DialogWindow is StagedSetupWindow setupWindow
|
||||
&& setupWindow.AutoAdvance)
|
||||
{
|
||||
setupWindow.NextIncompleteStage();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,6 +41,8 @@ namespace MatterHackers.MatterControl
|
|||
|
||||
Vector2 WindowSize { get; }
|
||||
|
||||
bool AutoAdvance { get; set; }
|
||||
|
||||
Func<DialogPage> HomePageGenerator { get; }
|
||||
}
|
||||
}
|
||||
|
|
@ -228,6 +228,8 @@ namespace MatterHackers.MatterControl
|
|||
};
|
||||
}
|
||||
|
||||
public bool AutoAdvance { get; set; }
|
||||
|
||||
public string Title { get; } = "Printer Calibration".Localize();
|
||||
|
||||
public Vector2 WindowSize { get; } = new Vector2(1200, 700);
|
||||
|
|
|
|||
|
|
@ -100,6 +100,8 @@ namespace MatterHackers.MatterControl
|
|||
var homePage = setupWizard.HomePageGenerator();
|
||||
SetSizeAndShow(wizardWindow, homePage);
|
||||
|
||||
setupWizard.AutoAdvance = advanceToIncompleteStage;
|
||||
|
||||
if (advanceToIncompleteStage)
|
||||
{
|
||||
wizardWindow.NextIncompleteStage();
|
||||
|
|
|
|||
|
|
@ -156,6 +156,8 @@ namespace MatterHackers.MatterControl
|
|||
this.AddChild(row);
|
||||
}
|
||||
|
||||
public bool AutoAdvance => setupWizard.AutoAdvance;
|
||||
|
||||
public override void OnClosing(ClosingEventArgs eventArgs)
|
||||
{
|
||||
if (this.ActiveStage != null
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue