From 5e7811b2fdb0bfab0c596aa204b28db528ad657e Mon Sep 17 00:00:00 2001 From: jlewin Date: Tue, 26 Mar 2019 11:32:18 -0700 Subject: [PATCH] Improve instance name to highlight how data is used --- .../SetupWizards/XyCalibrationData.cs | 1 - .../SetupWizards/XyCalibrationWizard.cs | 18 +++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/MatterControlLib/ConfigurationPage/PrintLeveling/SetupWizards/XyCalibrationData.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/SetupWizards/XyCalibrationData.cs index c7a79ecea..591b45ab8 100644 --- a/MatterControlLib/ConfigurationPage/PrintLeveling/SetupWizards/XyCalibrationData.cs +++ b/MatterControlLib/ConfigurationPage/PrintLeveling/SetupWizards/XyCalibrationData.cs @@ -40,7 +40,6 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling public int ExtruderToCalibrateIndex { get; } - public QualityType Quality { get; set; } = QualityType.Normal; /// diff --git a/MatterControlLib/ConfigurationPage/PrintLeveling/SetupWizards/XyCalibrationWizard.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/SetupWizards/XyCalibrationWizard.cs index 986c9e55e..138447f3b 100644 --- a/MatterControlLib/ConfigurationPage/PrintLeveling/SetupWizards/XyCalibrationWizard.cs +++ b/MatterControlLib/ConfigurationPage/PrintLeveling/SetupWizards/XyCalibrationWizard.cs @@ -71,19 +71,19 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling protected override IEnumerator GetPages() { - var xyCalibrationData = new XyCalibrationData(extruderToCalibrateIndex); + var wizardState = new XyCalibrationData(extruderToCalibrateIndex); - yield return new XyCalibrationSelectPage(this, printer, xyCalibrationData); - yield return new XyCalibrationStartPrintPage(this, printer, xyCalibrationData); - yield return new XyCalibrationCollectDataPage(this, printer, xyCalibrationData); - yield return new XyCalibrationDataRecieved(this, printer, xyCalibrationData); + yield return new XyCalibrationSelectPage(this, printer, wizardState); + yield return new XyCalibrationStartPrintPage(this, printer, wizardState); + yield return new XyCalibrationCollectDataPage(this, printer, wizardState); + yield return new XyCalibrationDataRecieved(this, printer, wizardState); // loop until we are done calibrating - while (xyCalibrationData.PrintAgain) + while (wizardState.PrintAgain) { - yield return new XyCalibrationStartPrintPage(this, printer, xyCalibrationData); - yield return new XyCalibrationCollectDataPage(this, printer, xyCalibrationData); - yield return new XyCalibrationDataRecieved(this, printer, xyCalibrationData); + yield return new XyCalibrationStartPrintPage(this, printer, wizardState); + yield return new XyCalibrationCollectDataPage(this, printer, wizardState); + yield return new XyCalibrationDataRecieved(this, printer, wizardState); } } }