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

Switch back to pre-calibration bed on XY Calibration wizard exit

Browse source 
- Issue MatterHackers/MCCentral#521
This commit is contained in:
jlewin 2019-03-26 16:40:49 -07:00
parent 87908f1af7
commit 5ad7f0d284
2 changed files with 27 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,6 +28,8 @@ either expressed or implied, of the FreeBSD Project.
*/
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using MatterHackers.Agg.UI;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.SlicerConfiguration;
@ -37,6 +39,8 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
{
public class XyCalibrationWizard : PrinterSetupWizard
{
private EditContext originalEditContext;
public XyCalibrationWizard(PrinterConfig printer, int extruderToCalibrateIndex)
: base(printer)
{
@ -82,10 +86,29 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
&& printer.Settings.GetValue<bool>(SettingsKey.use_z_probe);
}
public async override void Dispose()
{
if (originalEditContext != null
&& printer.Bed.EditContext != originalEditContext)
{
await printer.Bed.LoadContent(originalEditContext);
}
base.Dispose();
}
protected override IEnumerator<WizardPage> GetPages()
{
yield return new XyCalibrationSelectPage(this);
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);