From 60beceea6df9c35e6360e01b855a410c7e3882dd Mon Sep 17 00:00:00 2001 From: jlewin Date: Tue, 14 May 2019 17:45:27 -0700 Subject: [PATCH] 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 --- .../ConfigurationPage/PrintLeveling/WizardPages/WizardPage.cs | 3 ++- .../PrinterControls/ControlWidgets/IStagedSetupWizard.cs | 2 ++ .../PrinterControls/ControlWidgets/PrinterCalibrationWizard.cs | 2 ++ MatterControlLib/SetupWizard/DialogWindow.cs | 2 ++ MatterControlLib/SetupWizard/StagedSetupWindow.cs | 2 ++ 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/WizardPage.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/WizardPage.cs index 93aea5dc4..2727a363a 100644 --- a/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/WizardPage.cs +++ b/MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/WizardPage.cs @@ -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(); } diff --git a/MatterControlLib/PrinterControls/ControlWidgets/IStagedSetupWizard.cs b/MatterControlLib/PrinterControls/ControlWidgets/IStagedSetupWizard.cs index b85985215..53e41eb88 100644 --- a/MatterControlLib/PrinterControls/ControlWidgets/IStagedSetupWizard.cs +++ b/MatterControlLib/PrinterControls/ControlWidgets/IStagedSetupWizard.cs @@ -41,6 +41,8 @@ namespace MatterHackers.MatterControl Vector2 WindowSize { get; } + bool AutoAdvance { get; set; } + Func HomePageGenerator { get; } } } \ No newline at end of file diff --git a/MatterControlLib/PrinterControls/ControlWidgets/PrinterCalibrationWizard.cs b/MatterControlLib/PrinterControls/ControlWidgets/PrinterCalibrationWizard.cs index 4cfad3efd..dda9f8c60 100644 --- a/MatterControlLib/PrinterControls/ControlWidgets/PrinterCalibrationWizard.cs +++ b/MatterControlLib/PrinterControls/ControlWidgets/PrinterCalibrationWizard.cs @@ -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); diff --git a/MatterControlLib/SetupWizard/DialogWindow.cs b/MatterControlLib/SetupWizard/DialogWindow.cs index 39874d678..b466ee3ba 100644 --- a/MatterControlLib/SetupWizard/DialogWindow.cs +++ b/MatterControlLib/SetupWizard/DialogWindow.cs @@ -100,6 +100,8 @@ namespace MatterHackers.MatterControl var homePage = setupWizard.HomePageGenerator(); SetSizeAndShow(wizardWindow, homePage); + setupWizard.AutoAdvance = advanceToIncompleteStage; + if (advanceToIncompleteStage) { wizardWindow.NextIncompleteStage(); diff --git a/MatterControlLib/SetupWizard/StagedSetupWindow.cs b/MatterControlLib/SetupWizard/StagedSetupWindow.cs index 8812194ab..e11119902 100644 --- a/MatterControlLib/SetupWizard/StagedSetupWindow.cs +++ b/MatterControlLib/SetupWizard/StagedSetupWindow.cs @@ -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