diff --git a/ActionBar/PrintActionRow.cs b/ActionBar/PrintActionRow.cs index e1fcb149d..0904dbdf1 100644 --- a/ActionBar/PrintActionRow.cs +++ b/ActionBar/PrintActionRow.cs @@ -304,8 +304,8 @@ namespace MatterHackers.MatterControl.ActionBar case PrinterConnectionAndCommunication.CommunicationStates.Connected: PrintLevelingData levelingData = ActiveSliceSettings.Instance.Helpers.GetPrintLevelingData(); - if (levelingData != null && ActiveSliceSettings.Instance.GetValue("print_leveling_required_to_print") - && !levelingData.HasBeenRun()) + if (levelingData != null && ActiveSliceSettings.Instance.GetValue(SettingsKey.print_leveling_required_to_print) + && !levelingData.HasBeenRunAndEnabled()) { this.activePrintButtons.Add(configureButton); } diff --git a/ActionBar/PrintStatusRow.cs b/ActionBar/PrintStatusRow.cs index 0e8c04563..f3bf24ffd 100644 --- a/ActionBar/PrintStatusRow.cs +++ b/ActionBar/PrintStatusRow.cs @@ -252,16 +252,16 @@ namespace MatterHackers.MatterControl.ActionBar autoLevelButton.Margin = new Agg.BorderDouble(top: 3); autoLevelButton.ToolTipText = "Print leveling is enabled.".Localize(); autoLevelButton.Cursor = Cursors.Hand; - autoLevelButton.Visible = ActiveSliceSettings.Instance.GetValue("print_leveling_enabled"); + autoLevelButton.Visible = ActiveSliceSettings.Instance.GetValue(SettingsKey.print_leveling_enabled); ActiveSliceSettings.ActivePrinterChanged.RegisterEvent((sender, e) => { - autoLevelButton.Visible = ActiveSliceSettings.Instance.GetValue("print_leveling_enabled"); + autoLevelButton.Visible = ActiveSliceSettings.Instance.GetValue(SettingsKey.print_leveling_enabled); }, ref unregisterEvents); PrinterSettings.PrintLevelingEnabledChanged.RegisterEvent((sender, e) => { - autoLevelButton.Visible = ActiveSliceSettings.Instance.GetValue("print_leveling_enabled"); + autoLevelButton.Visible = ActiveSliceSettings.Instance.GetValue(SettingsKey.print_leveling_enabled); }, ref unregisterEvents); return autoLevelButton; @@ -698,16 +698,16 @@ namespace MatterHackers.MatterControl.ActionBar autoLevelButton.Cursor = Cursors.Hand; autoLevelButton.Margin = new Agg.BorderDouble(top: 3); autoLevelButton.ToolTipText = "Print leveling is enabled.".Localize(); - autoLevelButton.Visible = ActiveSliceSettings.Instance.GetValue("print_leveling_enabled"); + autoLevelButton.Visible = ActiveSliceSettings.Instance.GetValue(SettingsKey.print_leveling_enabled); ActiveSliceSettings.ActivePrinterChanged.RegisterEvent((sender, e) => { - autoLevelButton.Visible = ActiveSliceSettings.Instance.GetValue("print_leveling_enabled"); + autoLevelButton.Visible = ActiveSliceSettings.Instance.GetValue(SettingsKey.print_leveling_enabled); }, ref unregisterEvents); PrinterSettings.PrintLevelingEnabledChanged.RegisterEvent((sender, e) => { - autoLevelButton.Visible = ActiveSliceSettings.Instance.GetValue("print_leveling_enabled"); + autoLevelButton.Visible = ActiveSliceSettings.Instance.GetValue(SettingsKey.print_leveling_enabled); }, ref unregisterEvents); return autoLevelButton; diff --git a/ApplicationView/MainApplicationWidget.cs b/ApplicationView/MainApplicationWidget.cs index 51127be41..51300e8d3 100644 --- a/ApplicationView/MainApplicationWidget.cs +++ b/ApplicationView/MainApplicationWidget.cs @@ -578,7 +578,7 @@ namespace MatterHackers.MatterControl } } - if (OsInformation.OperatingSystem != OSType.Windows) + if (OsInformation.OperatingSystem == OSType.Android) { // show this last so it is on top if (UserSettings.Instance.get("SoftwareLicenseAccepted") != "true") diff --git a/ConfigurationPage/CalibrationSettings/CalibrationSettingsView.cs b/ConfigurationPage/CalibrationSettings/CalibrationSettingsView.cs index f5b5a0660..5e4ad9439 100644 --- a/ConfigurationPage/CalibrationSettings/CalibrationSettingsView.cs +++ b/ConfigurationPage/CalibrationSettings/CalibrationSettingsView.cs @@ -114,7 +114,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage buttonRow.AddChild(runPrintLevelingButton); // put in the switch - CheckBox printLevelingSwitch = ImageButtonFactory.CreateToggleSwitch(ActiveSliceSettings.Instance.GetValue("print_leveling_enabled")); + CheckBox printLevelingSwitch = ImageButtonFactory.CreateToggleSwitch(ActiveSliceSettings.Instance.GetValue(SettingsKey.print_leveling_enabled)); printLevelingSwitch.VAnchor = VAnchor.ParentCenter; printLevelingSwitch.Margin = new BorderDouble(left: 16); printLevelingSwitch.CheckedStateChanged += (sender, e) => @@ -124,11 +124,11 @@ namespace MatterHackers.MatterControl.ConfigurationPage PrinterSettings.PrintLevelingEnabledChanged.RegisterEvent((sender, e) => { - printLevelingSwitch.Checked = ActiveSliceSettings.Instance.GetValue("print_leveling_enabled"); + printLevelingSwitch.Checked = ActiveSliceSettings.Instance.GetValue(SettingsKey.print_leveling_enabled); }, ref unregisterEvents); // only show the switch if leveling can be turned off (it can't if it is required). - if (!ActiveSliceSettings.Instance.GetValue("print_leveling_required_to_print")) + if (!ActiveSliceSettings.Instance.GetValue(SettingsKey.print_leveling_required_to_print)) { buttonRow.AddChild(printLevelingSwitch); } diff --git a/ConfigurationPage/PrintLeveling/LevelWizard13PointRadial.cs b/ConfigurationPage/PrintLeveling/LevelWizard13PointRadial.cs index 37c387f8e..1a3ef7db0 100644 --- a/ConfigurationPage/PrintLeveling/LevelWizard13PointRadial.cs +++ b/ConfigurationPage/PrintLeveling/LevelWizard13PointRadial.cs @@ -52,7 +52,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling public static string ApplyLeveling(string lineBeingSent, Vector3 currentDestination, PrinterMachineInstruction.MovementTypes movementMode) { var settings = ActiveSliceSettings.Instance; - if (settings?.GetValue("print_leveling_enabled") == true + if (settings?.GetValue(SettingsKey.print_leveling_enabled) == true && (lineBeingSent.StartsWith("G0 ") || lineBeingSent.StartsWith("G1 ")) && lineBeingSent.Length > 2 && lineBeingSent[2] == ' ') diff --git a/ConfigurationPage/PrintLeveling/LevelWizard2Point.cs b/ConfigurationPage/PrintLeveling/LevelWizard2Point.cs index 7227efd1a..683bf0ad5 100644 --- a/ConfigurationPage/PrintLeveling/LevelWizard2Point.cs +++ b/ConfigurationPage/PrintLeveling/LevelWizard2Point.cs @@ -117,7 +117,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling public static string ApplyLeveling(string lineBeingSent, Vector3 currentDestination, PrinterMachineInstruction.MovementTypes movementMode) { var settings = ActiveSliceSettings.Instance; - if (settings?.GetValue("print_leveling_enabled") == true + if (settings?.GetValue(SettingsKey.print_leveling_enabled) == true && (lineBeingSent.StartsWith("G0 ") || lineBeingSent.StartsWith("G1 "))) { lineBeingSent = PrintLevelingPlane.Instance.ApplyLeveling(currentDestination, movementMode, lineBeingSent); diff --git a/ConfigurationPage/PrintLeveling/LevelWizard3Point.cs b/ConfigurationPage/PrintLeveling/LevelWizard3Point.cs index d822a2055..197739595 100644 --- a/ConfigurationPage/PrintLeveling/LevelWizard3Point.cs +++ b/ConfigurationPage/PrintLeveling/LevelWizard3Point.cs @@ -102,7 +102,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling public static string ApplyLeveling(string lineBeingSent, Vector3 currentDestination, PrinterMachineInstruction.MovementTypes movementMode) { var settings = ActiveSliceSettings.Instance; - if (settings?.GetValue("print_leveling_enabled") == true + if (settings?.GetValue(SettingsKey.print_leveling_enabled) == true && (lineBeingSent.StartsWith("G0 ") || lineBeingSent.StartsWith("G1 "))) { lineBeingSent = PrintLevelingPlane.Instance.ApplyLeveling(currentDestination, movementMode, lineBeingSent); diff --git a/ConfigurationPage/PrintLeveling/LevelWizard7PointRadial.cs b/ConfigurationPage/PrintLeveling/LevelWizard7PointRadial.cs index bceede16c..7a0e2f261 100644 --- a/ConfigurationPage/PrintLeveling/LevelWizard7PointRadial.cs +++ b/ConfigurationPage/PrintLeveling/LevelWizard7PointRadial.cs @@ -261,7 +261,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling public static string ApplyLeveling(string lineBeingSent, Vector3 currentDestination, PrinterMachineInstruction.MovementTypes movementMode) { var settings = ActiveSliceSettings.Instance; - if (settings?.GetValue("print_leveling_enabled") == true + if (settings?.GetValue(SettingsKey.print_leveling_enabled) == true && (lineBeingSent.StartsWith("G0 ") || lineBeingSent.StartsWith("G1 ")) && lineBeingSent.Length > 2 && lineBeingSent[2] == ' ') diff --git a/ConfigurationPage/PrintLeveling/LevelWizardBase.cs b/ConfigurationPage/PrintLeveling/LevelWizardBase.cs index 46a9da16d..91f7d31aa 100644 --- a/ConfigurationPage/PrintLeveling/LevelWizardBase.cs +++ b/ConfigurationPage/PrintLeveling/LevelWizardBase.cs @@ -127,7 +127,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling { LevelWizardBase.RuningState runningState = LevelWizardBase.RuningState.UserRequestedCalibration; - if (ActiveSliceSettings.Instance.GetValue("print_leveling_required_to_print")) + if (ActiveSliceSettings.Instance.GetValue(SettingsKey.print_leveling_required_to_print)) { // run in the first run state runningState = LevelWizardBase.RuningState.InitialStartupCalibration; diff --git a/ConfigurationPage/PrintLeveling/PrintLevelingData.cs b/ConfigurationPage/PrintLeveling/PrintLevelingData.cs index 0ee82f088..96e91d400 100644 --- a/ConfigurationPage/PrintLeveling/PrintLevelingData.cs +++ b/ConfigurationPage/PrintLeveling/PrintLevelingData.cs @@ -161,8 +161,13 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling } } - public bool HasBeenRun() + public bool HasBeenRunAndEnabled() { + if(!ActiveSliceSettings.Instance.GetValue(SettingsKey.print_leveling_enabled)) + { + return false; + } + switch (CurrentPrinterLevelingSystem) { case PrintLevelingData.LevelingSystem.Probe2Points: diff --git a/CustomWidgets/ExportPrintItemWindow.cs b/CustomWidgets/ExportPrintItemWindow.cs index fdd117ef9..2890f2cc5 100644 --- a/CustomWidgets/ExportPrintItemWindow.cs +++ b/CustomWidgets/ExportPrintItemWindow.cs @@ -192,7 +192,7 @@ namespace MatterHackers.MatterControl middleRowContainer.AddChild(new VerticalSpacer()); // If print leveling is enabled then add in a check box 'Apply Leveling During Export' and default checked. - if (showExportGCodeButton && ActiveSliceSettings.Instance.GetValue("print_leveling_enabled")) + if (showExportGCodeButton && ActiveSliceSettings.Instance.GetValue(SettingsKey.print_leveling_enabled)) { applyLeveling = new CheckBox(LocalizedString.Get(applyLevelingDuringExportString), ActiveTheme.Instance.PrimaryTextColor, 10); applyLeveling.Checked = true; @@ -307,7 +307,7 @@ namespace MatterHackers.MatterControl { try { - if (ActiveSliceSettings.Instance.GetValue("print_leveling_enabled")) + if (ActiveSliceSettings.Instance.GetValue(SettingsKey.print_leveling_enabled)) { if (applyLeveling.Checked) { diff --git a/CustomWidgets/WizardControl.cs b/CustomWidgets/WizardControl.cs index 6eed02438..49be9f923 100644 --- a/CustomWidgets/WizardControl.cs +++ b/CustomWidgets/WizardControl.cs @@ -146,10 +146,15 @@ namespace MatterHackers.MatterControl if (topSystemWindow != null) { topSystemWindow.CloseOnIdle(); - ApplicationController.Instance.ReloadAll(null, null); } } + public override void OnClosed(EventArgs e) + { + ApplicationController.Instance.ReloadAll(null, null); + base.OnClosed(e); + } + private void next_Click(object sender, EventArgs mouseEvent) { pageIndex = Math.Min(pages.Count - 1, pageIndex + 1); diff --git a/DataStorage/Classic/ClassicSqlitePrinterProfiles.cs b/DataStorage/Classic/ClassicSqlitePrinterProfiles.cs index 8a48bcc20..9fc83649d 100644 --- a/DataStorage/Classic/ClassicSqlitePrinterProfiles.cs +++ b/DataStorage/Classic/ClassicSqlitePrinterProfiles.cs @@ -128,7 +128,7 @@ namespace MatterHackers.MatterControl.DataStorage.ClassicDB printer.PrintLevelingProbePositions); layeredProfile.UserLayer[SettingsKey.print_leveling_data] = JsonConvert.SerializeObject(printLevelingData); - layeredProfile.UserLayer["print_leveling_enabled"] = printer.DoPrintLeveling ? "true" : "false"; + layeredProfile.UserLayer[SettingsKey.print_leveling_enabled] = printer.DoPrintLeveling ? "true" : "false"; layeredProfile.UserLayer["manual_movement_speeds"] = printer.ManualMovementSpeeds; diff --git a/PrinterCommunication/Io/PrintLevelingStream.cs b/PrinterCommunication/Io/PrintLevelingStream.cs index 6d52f2ef2..e328f412e 100644 --- a/PrinterCommunication/Io/PrintLevelingStream.cs +++ b/PrinterCommunication/Io/PrintLevelingStream.cs @@ -52,7 +52,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io string lineFromChild = base.ReadLine(); if (lineFromChild != null - && PrinterConnectionAndCommunication.Instance.ActivePrinter.GetValue("print_leveling_enabled")) + && PrinterConnectionAndCommunication.Instance.ActivePrinter.GetValue(SettingsKey.print_leveling_enabled)) { if (LineIsMovement(lineFromChild)) { diff --git a/PrinterCommunication/PrinterConnectionAndCommunication.cs b/PrinterCommunication/PrinterConnectionAndCommunication.cs index c310bde2f..74e4f2ea4 100644 --- a/PrinterCommunication/PrinterConnectionAndCommunication.cs +++ b/PrinterCommunication/PrinterConnectionAndCommunication.cs @@ -1422,11 +1422,11 @@ namespace MatterHackers.MatterControl.PrinterCommunication try { // If leveling is required or is currently on - if (ActiveSliceSettings.Instance.GetValue("print_leveling_required_to_print") - || ActiveSliceSettings.Instance.GetValue("print_leveling_enabled")) + if (ActiveSliceSettings.Instance.GetValue(SettingsKey.print_leveling_required_to_print) + || ActiveSliceSettings.Instance.GetValue(SettingsKey.print_leveling_enabled)) { PrintLevelingData levelingData = ActiveSliceSettings.Instance.Helpers.GetPrintLevelingData(); - if(levelingData?.HasBeenRun() != true) + if(levelingData?.HasBeenRunAndEnabled() != true) { LevelWizardBase.ShowPrintLevelWizard(); return; @@ -1723,11 +1723,11 @@ namespace MatterHackers.MatterControl.PrinterCommunication UiThread.RunOnIdle(() => ConnectionSucceeded.CallEvents(this, null)); // run the print leveling wizard if we need to for this printer - if (ActiveSliceSettings.Instance.GetValue("print_leveling_required_to_print") - || ActiveSliceSettings.Instance.GetValue("print_leveling_enabled")) + if (ActiveSliceSettings.Instance.GetValue(SettingsKey.print_leveling_required_to_print) + || ActiveSliceSettings.Instance.GetValue(SettingsKey.print_leveling_enabled)) { PrintLevelingData levelingData = ActiveSliceSettings.Instance.Helpers.GetPrintLevelingData(); - if (levelingData?.HasBeenRun() != true) + if (levelingData?.HasBeenRunAndEnabled() != true) { UiThread.RunOnIdle(LevelWizardBase.ShowPrintLevelWizard); } diff --git a/Queue/OptionsMenu/ExportToFolderProcess.cs b/Queue/OptionsMenu/ExportToFolderProcess.cs index 02f6a1eea..8b73810b3 100644 --- a/Queue/OptionsMenu/ExportToFolderProcess.cs +++ b/Queue/OptionsMenu/ExportToFolderProcess.cs @@ -191,7 +191,7 @@ namespace MatterHackers.MatterControl.PrintQueue string outputFileName = Path.ChangeExtension(originalFileName, ".gcode"); string outputPathAndName = Path.Combine(exportPath, outputFileName); - if (ActiveSliceSettings.Instance.GetValue("print_leveling_enabled")) + if (ActiveSliceSettings.Instance.GetValue(SettingsKey.print_leveling_enabled)) { GCodeFileLoaded unleveledGCode = new GCodeFileLoaded(savedGcodeFileName); diff --git a/SlicerConfiguration/Settings/PrinterSettings.cs b/SlicerConfiguration/Settings/PrinterSettings.cs index b5617c42e..b066bde10 100644 --- a/SlicerConfiguration/Settings/PrinterSettings.cs +++ b/SlicerConfiguration/Settings/PrinterSettings.cs @@ -493,6 +493,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration // Print leveling data has no SliceSettingsWidget editor but should be removed on 'Reset to Defaults' keysToRetain.Remove(SettingsKey.print_leveling_data); + keysToRetain.Remove(SettingsKey.print_leveling_enabled); // Iterate all items that have .ShowAsOverride = false and conditionally add to the retention list foreach (var item in SliceSettingsOrganizer.Instance.SettingsData.Where(settingsItem => settingsItem.ShowAsOverride == false)) @@ -706,7 +707,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration } // If we have print leveling turned on then make sure we don't have any leveling commands in the start gcode. - if (GetValue("print_leveling_enabled")) + if (GetValue(SettingsKey.print_leveling_enabled)) { string[] startGCode = GetValue("start_gcode").Replace("\\n", "\n").Split('\n'); foreach (string startGCodeLine in startGCode) diff --git a/SlicerConfiguration/Settings/ProfileMigrations.cs b/SlicerConfiguration/Settings/ProfileMigrations.cs index 1c36a2d39..14d2363a0 100644 --- a/SlicerConfiguration/Settings/ProfileMigrations.cs +++ b/SlicerConfiguration/Settings/ProfileMigrations.cs @@ -202,7 +202,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration break; case "MatterControl.PrintLevelingEnabled": - layer.Add("print_leveling_enabled", item.Value); + layer.Add(SettingsKey.print_leveling_enabled, item.Value); break; case "MatterControl.ManualMovementSpeeds": diff --git a/SlicerConfiguration/Settings/SettingsHelpers.cs b/SlicerConfiguration/Settings/SettingsHelpers.cs index 30234582b..0033310b2 100644 --- a/SlicerConfiguration/Settings/SettingsHelpers.cs +++ b/SlicerConfiguration/Settings/SettingsHelpers.cs @@ -89,18 +89,20 @@ namespace MatterHackers.MatterControl.SlicerConfiguration public const string pause_gcode = nameof(pause_gcode); public const string perimeter_start_end_overlap = nameof(perimeter_start_end_overlap); public const string print_center = nameof(print_center); + public const string print_leveling_data = nameof(print_leveling_data); + public const string print_leveling_enabled = nameof(print_leveling_enabled); + public const string print_leveling_required_to_print = nameof(print_leveling_required_to_print); public const string printer_name = nameof(printer_name); public const string publish_bed_image = nameof(publish_bed_image); - public const string resume_gcode = nameof(resume_gcode); + public const string recover_first_layer_speed = nameof(recover_first_layer_speed); public const string recover_is_enabled = nameof(recover_is_enabled); public const string recover_position_before_z_home = nameof(recover_position_before_z_home); - public const string recover_first_layer_speed = nameof(recover_first_layer_speed); + public const string resume_gcode = nameof(resume_gcode); public const string show_reset_connection = nameof(show_reset_connection); public const string spiral_vase = nameof(spiral_vase); public const string start_gcode = nameof(start_gcode); public const string windows_driver = nameof(windows_driver); public const string z_homes_to_max = nameof(z_homes_to_max); - public const string print_leveling_data = nameof(print_leveling_data); } public class SettingsHelpers @@ -256,12 +258,12 @@ namespace MatterHackers.MatterControl.SlicerConfiguration public void DoPrintLeveling(bool doLeveling) { // Early exit if already set - if (doLeveling == printerSettings.GetValue("print_leveling_enabled")) + if (doLeveling == printerSettings.GetValue(SettingsKey.print_leveling_enabled)) { return; } - printerSettings.SetValue("print_leveling_enabled", doLeveling ? "1" : "0"); + printerSettings.SetValue(SettingsKey.print_leveling_enabled, doLeveling ? "1" : "0"); PrinterSettings.PrintLevelingEnabledChanged?.CallEvents(this, null); diff --git a/SlicerConfiguration/SliceSettingsDetailControl.cs b/SlicerConfiguration/SliceSettingsDetailControl.cs index 4612337d2..73746046e 100644 --- a/SlicerConfiguration/SliceSettingsDetailControl.cs +++ b/SlicerConfiguration/SliceSettingsDetailControl.cs @@ -106,6 +106,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration MenuAsWideAsItems = false, AlignToRightEdge = true, }; + sliceOptionsMenuDropList.Name = "Slice Settings Options Menu"; sliceOptionsMenuDropList.VAnchor |= VAnchor.ParentCenter; sliceOptionsMenuDropList.AddItem("Import".Localize()).Selected += (s, e) => { ImportSettingsMenu_Click(); }; @@ -140,9 +141,24 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { if (revertSettings) { + bool onlyReloadSliceSettings = true; + if (ActiveSliceSettings.Instance.GetValue(SettingsKey.print_leveling_required_to_print) + && ActiveSliceSettings.Instance.GetValue(SettingsKey.print_leveling_enabled)) + { + onlyReloadSliceSettings = false; + } + ActiveSliceSettings.Instance.ClearUserOverrides(); ActiveSliceSettings.Instance.Save(); - ApplicationController.Instance.ReloadAdvancedControlsPanel(); + + if (onlyReloadSliceSettings) + { + ApplicationController.Instance.ReloadAdvancedControlsPanel(); + } + else + { + ApplicationController.Instance.ReloadAll(null, null); + } } }, resetToDefaultsMessage, diff --git a/SlicerConfiguration/SlicerMapping/EngineMapingBase.cs b/SlicerConfiguration/SlicerMapping/EngineMapingBase.cs index 0741bf504..30752cf42 100644 --- a/SlicerConfiguration/SlicerMapping/EngineMapingBase.cs +++ b/SlicerConfiguration/SlicerMapping/EngineMapingBase.cs @@ -62,7 +62,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration "manual_probe_paper_width", SettingsKey.pause_gcode, "print_leveling_method", - "print_leveling_required_to_print", + SettingsKey.print_leveling_required_to_print, "print_leveling_solution", SettingsKey.recover_first_layer_speed, SettingsKey.recover_is_enabled, diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice index 3ed7bd36b..8f74a3cf7 160000 --- a/Submodules/MatterSlice +++ b/Submodules/MatterSlice @@ -1 +1 @@ -Subproject commit 3ed7bd36ba575703d660653053d2cefbedd7d489 +Subproject commit 8f74a3cf71f55af66d50ba14d4c6651151aac3e0 diff --git a/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs b/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs index 55331ffd0..9e64ff5ef 100644 --- a/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs +++ b/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs @@ -83,13 +83,25 @@ namespace MatterHackers.MatterControl.Tests.Automation resultsHarness.AddTestResult(testRunner.WaitForName("Start Print Button", .5), "Start Print showing"); resultsHarness.AddTestResult(!testRunner.WaitForName("Finish Setup Button", .5), "Finish Setup hidden"); + // reset to defaults and make sure print leveling is cleared + MatterControlUtilities.SwitchToAdvancedSettings(testRunner, resultsHarness); + + resultsHarness.AddTestResult(testRunner.ClickByName("Slice Settings Options Menu", 1), "Click Options" ); + resultsHarness.AddTestResult(testRunner.ClickByName("Reset to defaults Menu Item", 1), "Select Reset to defaults"); + resultsHarness.AddTestResult(testRunner.ClickByName("Yes Button", .5), "Click yes to revert"); + testRunner.Wait(1); + + // make sure it is showing the correct button + resultsHarness.AddTestResult(!testRunner.WaitForName("Start Print Button", .5), "Start Print hidden"); + resultsHarness.AddTestResult(testRunner.WaitForName("Finish Setup Button", .5), "Finish Setup showing"); + MatterControlUtilities.CloseMatterControl(testRunner); } }; - AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun, overrideHeight: 800); + AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun); - Assert.IsTrue(testHarness.AllTestsPassed(5)); + Assert.IsTrue(testHarness.AllTestsPassed(7)); } } }