From c6fcdb461588225dcd92e5c54ed4f2836b7e7acd Mon Sep 17 00:00:00 2001 From: jlewin Date: Fri, 8 Mar 2019 16:59:04 -0800 Subject: [PATCH] Add fix for Bed Leveling Temp validation, add support for disable --- .../ApplicationView/SettingsValidation.cs | 16 ++++++++-------- .../View3D/PrinterBar/ValidationErrorsPanel.cs | 3 ++- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/MatterControlLib/ApplicationView/SettingsValidation.cs b/MatterControlLib/ApplicationView/SettingsValidation.cs index 76730a950..1e5cc053c 100644 --- a/MatterControlLib/ApplicationView/SettingsValidation.cs +++ b/MatterControlLib/ApplicationView/SettingsValidation.cs @@ -34,6 +34,7 @@ using System.Threading; using MatterHackers.Agg; using MatterHackers.Agg.UI; using MatterHackers.Localizations; +using MatterHackers.MatterControl.ConfigurationPage.PrintLeveling; using MatterHackers.MatterControl.DesignTools; using MatterHackers.MatterControl.SlicerConfiguration; @@ -208,16 +209,15 @@ namespace MatterHackers.MatterControl ErrorLevel = ValidationErrorLevel.Warning, FixAction = new NamedAction() { - Title = "Dismiss", + Title = "Recalibrate", Action = () => { - // Get active leveling - ensure we pull the leveling data at the moment of dismiss invoke - PrintLevelingData leveling = printer.Settings.Helpers.GetPrintLevelingData(); - leveling.IssuedLevelingTempWarning = true; - - // Store leveling data with IssuedLevelingTempWarning set - printer.Settings.Helpers.SetPrintLevelingData(leveling); - } + UiThread.RunOnIdle(() => + { + DialogWindow.Show(new PrintLevelingWizard(printer)); + }); + }, + IsEnabled =() => printer.Connection.IsConnected } }); } diff --git a/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/ValidationErrorsPanel.cs b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/ValidationErrorsPanel.cs index 729c8c6ff..6085016af 100644 --- a/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/ValidationErrorsPanel.cs +++ b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/ValidationErrorsPanel.cs @@ -88,7 +88,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow var button = new LinkLabel(action.Title, theme, pointSize: theme.FontSize10) { VAnchor = VAnchor.Center, - Margin = new BorderDouble(right: 8) + Margin = new BorderDouble(right: 8), + Enabled = action.IsEnabled == null || action.IsEnabled() }; if (!string.IsNullOrEmpty(action.ID))