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

Combine Start Print/Calibration Mode pages

Browse source 
- Issue MatterHackers/MCCentral#5479
Remove excess step from Nozzle Calibration wizard
This commit is contained in:
jlewin 2019-05-14 17:42:37 -07:00
parent 40229eed1d
commit 415d5206e7
3 changed files with 149 additions and 209 deletions
Download patch file Download diff file Expand all files Collapse all files

16
MatterControlLib/ConfigurationPage/PrintLeveling/SetupWizards/XyCalibrationWizard.cs
View file

@ -73,7 +73,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
public double Offset { get; set; } = .1;
public bool PrintAgain { get; set; }
public bool PrintAgain { get; set; } = true;
public override bool SetupRequired => NeedsToBeRun(printer);
@ -132,27 +132,19 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
WindowTitle = Title,
};
yield return new XyCalibrationSelectPage(this);
// Require user confirmation after this point
this.RequireCancelConfirmation = true;
yield return new XyCalibrationStartPrintPage(this);
originalEditContext = printer.Bed.EditContext;
Task.Run(() =>
{
printer.Bed.SaveChanges(null, CancellationToken.None);
});
yield return new XyCalibrationCollectDataPage(this);
yield return new XyCalibrationDataRecieved(this);
// Require user confirmation after this point
this.RequireCancelConfirmation = true;
// loop until we are done calibrating
while (this.PrintAgain)
{
yield return new XyCalibrationStartPrintPage(this);
yield return new XyCalibrationSelectPage(this);
yield return new XyCalibrationCollectDataPage(this);
yield return new XyCalibrationDataRecieved(this);
}