diff --git a/MatterControlLib/ConfigurationPage/PrintLeveling/SetupWizards/XyCalibrationWizard.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/SetupWizards/XyCalibrationWizard.cs index a99d9e891..97a30f578 100644 --- a/MatterControlLib/ConfigurationPage/PrintLeveling/SetupWizards/XyCalibrationWizard.cs +++ b/MatterControlLib/ConfigurationPage/PrintLeveling/SetupWizards/XyCalibrationWizard.cs @@ -84,17 +84,17 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling protected override IEnumerator GetPages() { - yield return new XyCalibrationSelectPage(this, printer); - yield return new XyCalibrationStartPrintPage(this, printer); - yield return new XyCalibrationCollectDataPage(this, printer); - yield return new XyCalibrationDataRecieved(this, printer); + yield return new XyCalibrationSelectPage(this); + yield return new XyCalibrationStartPrintPage(this); + yield return new XyCalibrationCollectDataPage(this); + yield return new XyCalibrationDataRecieved(this); // loop until we are done calibrating while (this.PrintAgain) { - yield return new XyCalibrationStartPrintPage(this, printer); - yield return new XyCalibrationCollectDataPage(this, printer); - yield return new XyCalibrationDataRecieved(this, printer); + yield return new XyCalibrationStartPrintPage(this); + yield return new XyCalibrationCollectDataPage(this); + yield return new XyCalibrationDataRecieved(this); } } } diff --git a/MatterControlLib/CustomWidgets/XyCalibrationCollectDataPage.cs b/MatterControlLib/CustomWidgets/XyCalibrationCollectDataPage.cs index 2d4aa05c5..fbad3ee55 100644 --- a/MatterControlLib/CustomWidgets/XyCalibrationCollectDataPage.cs +++ b/MatterControlLib/CustomWidgets/XyCalibrationCollectDataPage.cs @@ -43,7 +43,7 @@ namespace MatterHackers.MatterControl private bool pageCanceled; private XyCalibrationWizard calibrationWizard; - public XyCalibrationCollectDataPage(XyCalibrationWizard calibrationWizard, PrinterConfig printer) + public XyCalibrationCollectDataPage(XyCalibrationWizard calibrationWizard) : base(calibrationWizard) { this.calibrationWizard = calibrationWizard; diff --git a/MatterControlLib/CustomWidgets/XyCalibrationDataRecieved.cs b/MatterControlLib/CustomWidgets/XyCalibrationDataRecieved.cs index 35d3a196b..3122220b6 100644 --- a/MatterControlLib/CustomWidgets/XyCalibrationDataRecieved.cs +++ b/MatterControlLib/CustomWidgets/XyCalibrationDataRecieved.cs @@ -37,7 +37,7 @@ namespace MatterHackers.MatterControl { public class XyCalibrationDataRecieved : WizardPage { - public XyCalibrationDataRecieved(XyCalibrationWizard calibrationWizard, PrinterConfig printer) + public XyCalibrationDataRecieved(XyCalibrationWizard calibrationWizard) : base(calibrationWizard) { this.WindowTitle = "Nozzle Offset Calibration Wizard".Localize(); @@ -87,6 +87,7 @@ namespace MatterHackers.MatterControl { Margin = new Agg.BorderDouble(0, 15, 0, 0) }); + var startFineCalibratingButton = theme.CreateDialogButton("Print Ultra Fine Calibration".Localize()); startFineCalibratingButton.HAnchor = HAnchor.Fit | HAnchor.Right; startFineCalibratingButton.VAnchor = VAnchor.Absolute; diff --git a/MatterControlLib/CustomWidgets/XyCalibrationSelectPage.cs b/MatterControlLib/CustomWidgets/XyCalibrationSelectPage.cs index 11be4ed24..927dc34e1 100644 --- a/MatterControlLib/CustomWidgets/XyCalibrationSelectPage.cs +++ b/MatterControlLib/CustomWidgets/XyCalibrationSelectPage.cs @@ -41,7 +41,7 @@ namespace MatterHackers.MatterControl private RadioButton normalCalibration; private RadioButton fineCalibration; - public XyCalibrationSelectPage(XyCalibrationWizard calibrationWizard, PrinterConfig printer) + public XyCalibrationSelectPage(XyCalibrationWizard calibrationWizard) : base(calibrationWizard) { this.WindowTitle = "Nozzle Offset Calibration Wizard".Localize(); diff --git a/MatterControlLib/CustomWidgets/XyCalibrationStartPrintPage.cs b/MatterControlLib/CustomWidgets/XyCalibrationStartPrintPage.cs index d49c01861..e076bc44c 100644 --- a/MatterControlLib/CustomWidgets/XyCalibrationStartPrintPage.cs +++ b/MatterControlLib/CustomWidgets/XyCalibrationStartPrintPage.cs @@ -43,7 +43,7 @@ namespace MatterHackers.MatterControl { public class XyCalibrationStartPrintPage : WizardPage { - public XyCalibrationStartPrintPage(XyCalibrationWizard calibrationWizard, PrinterConfig printer) + public XyCalibrationStartPrintPage(XyCalibrationWizard calibrationWizard) : base(calibrationWizard) { this.WindowTitle = "Nozzle Offset Calibration Wizard".Localize(); diff --git a/MatterControlLib/Library/Providers/MatterControl/PrimitivesContainer.cs b/MatterControlLib/Library/Providers/MatterControl/PrimitivesContainer.cs index 67028d80e..17029a4de 100644 --- a/MatterControlLib/Library/Providers/MatterControl/PrimitivesContainer.cs +++ b/MatterControlLib/Library/Providers/MatterControl/PrimitivesContainer.cs @@ -35,6 +35,7 @@ using MatterHackers.Agg.Platform; using MatterHackers.DataConverters3D; using MatterHackers.Localizations; using MatterHackers.MatterControl.DesignTools; +using MatterHackers.MatterControl.SlicerConfiguration; namespace MatterHackers.MatterControl.Library { @@ -56,6 +57,12 @@ namespace MatterHackers.MatterControl.Library () => "Cube".Localize(), async () => await CubeObject3D.Create()) { DateCreated = new System.DateTime(index++) }, +#if DEBUG + new GeneratorItem( + () => "Calibration Tab".Localize(), + async () => await XyCalibrationTabObject3D.Create()) + { DateCreated = new System.DateTime(index++) }, +#endif new GeneratorItem( () => "Pyramid".Localize(), async () => await PyramidObject3D.Create())