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

Reuse new wizard launcher, switch to incomplete stage mode

Browse source
This commit is contained in:
jlewin 2019-04-04 17:26:16 -07:00
parent a2fc4b916a
commit 1c08ccadeb
2 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
MatterControlLib/ApplicationView/ApplicationController.cs
View file

@ -2367,10 +2367,15 @@ namespace MatterHackers.MatterControl
try try
{ {
// If leveling is required or is currently on if (PrinterCalibrationWizard.SetupRequired(printer))
if(this.RunAnyRequiredPrinterSetup(printer, this.Theme))
{ {
// We need to calibrate. So, don't print this part. UiThread.RunOnIdle(() =>
{
DialogWindow.Show(
new PrinterCalibrationWizard(printer, AppContext.Theme),
advanceToIncompleteStage: true);
});
return; return;
} }

12
MatterControlLib/ApplicationView/PrinterConfig.cs
View file

@ -385,7 +385,17 @@ namespace MatterHackers.MatterControl
{ {
if (sender is PrinterConfig printer) if (sender is PrinterConfig printer)
{ {
ApplicationController.Instance.RunAnyRequiredPrinterSetup(printer, ApplicationController.Instance.Theme); if (PrinterCalibrationWizard.SetupRequired(printer))
{
UiThread.RunOnIdle(() =>
{
DialogWindow.Show(
new PrinterCalibrationWizard(printer, AppContext.Theme),
advanceToIncompleteStage: true);
});
return;
}
} }
} }