diff --git a/MatterControl.Printing/Settings/SliceSettingData.cs b/MatterControl.Printing/Settings/SliceSettingData.cs index 4bc31f18c..94fb1a977 100644 --- a/MatterControl.Printing/Settings/SliceSettingData.cs +++ b/MatterControl.Printing/Settings/SliceSettingData.cs @@ -63,7 +63,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration OFFSET, OFFSET3, POSITIVE_DOUBLE, - POSITIVE_DOUBLE_OR_INCOMPATABLE, + POSITIVE_DOUBLE_OR_INCOMPATIBLE, READONLY_STRING, SLICE_ENGINE, STRING, diff --git a/MatterControl.Printing/Settings/SliceSettingsFields.cs b/MatterControl.Printing/Settings/SliceSettingsFields.cs index c574991e3..82a4158ee 100644 --- a/MatterControl.Printing/Settings/SliceSettingsFields.cs +++ b/MatterControl.Printing/Settings/SliceSettingsFields.cs @@ -140,7 +140,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration SlicerConfigName = SettingsKey.bed_temperature_blue_tape, PresentationName = "Blue Tape Bed Temperature".Localize(), HelpText = "The temperature to print when the bed is coverd with blue tape. Set to 0 to disable or 'NC' if Not Compatible.".Localize(), - DataEditType = DataEditTypes.POSITIVE_DOUBLE_OR_INCOMPATABLE, + DataEditType = DataEditTypes.POSITIVE_DOUBLE_OR_INCOMPATIBLE, Units = "°C".Localize(), Show = (settings) => settings.GetBool(SettingsKey.has_heated_bed) && settings.GetBool(SettingsKey.has_swappable_bed), @@ -151,7 +151,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration SlicerConfigName = SettingsKey.bed_temperature_buildtak, PresentationName = "BuildTak Bed Temperature".Localize(), HelpText = "The temperature to print when the bed is using BuildTak. Set to 0 to disable or 'NC' if Not Compatible.".Localize(), - DataEditType = DataEditTypes.POSITIVE_DOUBLE_OR_INCOMPATABLE, + DataEditType = DataEditTypes.POSITIVE_DOUBLE_OR_INCOMPATIBLE, Units = "°C".Localize(), Show = (settings) => settings.GetBool(SettingsKey.has_heated_bed) && settings.GetBool(SettingsKey.has_swappable_bed), @@ -162,7 +162,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration SlicerConfigName = SettingsKey.bed_temperature_garolite, PresentationName = "Garolite Bed Temperature".Localize(), HelpText = "The temperature to print when the bed is using garolite. Set to 0 to disable or 'NC' if Not Compatible.".Localize(), - DataEditType = DataEditTypes.POSITIVE_DOUBLE_OR_INCOMPATABLE, + DataEditType = DataEditTypes.POSITIVE_DOUBLE_OR_INCOMPATIBLE, Units = "°C".Localize(), Show = (settings) => settings.GetBool(SettingsKey.has_heated_bed) && settings.GetBool(SettingsKey.has_swappable_bed), @@ -173,7 +173,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration SlicerConfigName = SettingsKey.bed_temperature_glass, PresentationName = "Glass Bed Temperature".Localize(), HelpText = "The temperature to print when the bed is using glass. Set to 0 to disable or 'NC' if Not Compatible.".Localize(), - DataEditType = DataEditTypes.POSITIVE_DOUBLE_OR_INCOMPATABLE, + DataEditType = DataEditTypes.POSITIVE_DOUBLE_OR_INCOMPATIBLE, Units = "°C".Localize(), Show = (settings) => settings.GetBool(SettingsKey.has_heated_bed) && settings.GetBool(SettingsKey.has_swappable_bed), @@ -184,7 +184,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration SlicerConfigName = SettingsKey.bed_temperature_kapton, PresentationName = "Kapton Bed Temperature".Localize(), HelpText = "The temperature to print when the bed is coverd in kapton tape. Set to 0 to disable or 'NC' if Not Compatible.".Localize(), - DataEditType = DataEditTypes.POSITIVE_DOUBLE_OR_INCOMPATABLE, + DataEditType = DataEditTypes.POSITIVE_DOUBLE_OR_INCOMPATIBLE, Units = "°C".Localize(), Show = (settings) => settings.GetBool(SettingsKey.has_heated_bed) && settings.GetBool(SettingsKey.has_swappable_bed), @@ -195,7 +195,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration SlicerConfigName = SettingsKey.bed_temperature_pei, PresentationName = "PEI Bed Temperature".Localize(), HelpText = "The temperature to print when the bed is using PEI. Set to 0 to disable or 'NC' if Not Compatible.".Localize(), - DataEditType = DataEditTypes.POSITIVE_DOUBLE_OR_INCOMPATABLE, + DataEditType = DataEditTypes.POSITIVE_DOUBLE_OR_INCOMPATIBLE, Units = "°C".Localize(), Show = (settings) => settings.GetBool(SettingsKey.has_heated_bed) && settings.GetBool(SettingsKey.has_swappable_bed), @@ -206,7 +206,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration SlicerConfigName = SettingsKey.bed_temperature_pp, PresentationName = "Polypropylene Bed Temperature".Localize(), HelpText = "The temperature to print when the bed is polypropylene. Set to 0 to disable or 'NC' if Not Compatible.".Localize(), - DataEditType = DataEditTypes.POSITIVE_DOUBLE_OR_INCOMPATABLE, + DataEditType = DataEditTypes.POSITIVE_DOUBLE_OR_INCOMPATIBLE, Units = "°C".Localize(), Show = (settings) => settings.GetBool(SettingsKey.has_heated_bed) && settings.GetBool(SettingsKey.has_swappable_bed), diff --git a/MatterControl.Printing/Settings/ValidationError.cs b/MatterControl.Printing/Settings/ValidationError.cs index f5aeab25b..71d980424 100644 --- a/MatterControl.Printing/Settings/ValidationError.cs +++ b/MatterControl.Printing/Settings/ValidationError.cs @@ -63,7 +63,7 @@ namespace MatterHackers.MatterControl public static readonly string BedLevelingTemperature = nameof(BedLevelingTemperature); public static readonly string BedSurfaceNotSelected = nameof(BedSurfaceNotSelected); public static readonly string ExceptionDuringSliceSettingsValidation = nameof(ExceptionDuringSliceSettingsValidation); - public static readonly string IncompatableBedSurfaceAndMaterial = nameof(IncompatableBedSurfaceAndMaterial); + public static readonly string IncompatibleBedSurfaceAndMaterial = nameof(IncompatibleBedSurfaceAndMaterial); public static readonly string ItemCannotBeExported = nameof(ItemCannotBeExported); public static readonly string ItemToAMFExportInvalid = nameof(ItemToAMFExportInvalid); public static readonly string ItemToSTLExportInvalid = nameof(ItemToSTLExportInvalid); diff --git a/MatterControlLib/ApplicationView/SettingsValidation.cs b/MatterControlLib/ApplicationView/SettingsValidation.cs index 488c59253..c12bf4564 100644 --- a/MatterControlLib/ApplicationView/SettingsValidation.cs +++ b/MatterControlLib/ApplicationView/SettingsValidation.cs @@ -614,9 +614,9 @@ namespace MatterHackers.MatterControl && settings.GetValue(SettingsKey.bed_surface) != "Default" && settings.GetValue(printer.Settings.Helpers.ActiveBedTemperatureSetting) == "NC") { - errors.Add(new ValidationError(ValidationErrors.IncompatableBedSurfaceAndMaterial) + errors.Add(new ValidationError(ValidationErrors.IncompatibleBedSurfaceAndMaterial) { - Error = "Selected Material and Bed Surface are Incompatable".Localize(), + Error = "Selected Material and Bed Surface are Incompatible".Localize(), Details = "The 'Material' you have selected is incompatible with the 'Bed Surface' you have selected. You may get poor bed adhesion or printing results. Changing the 'Bed Surface' is recommended. You can change it in the 'Bed Temperature' menu on the top right of your screen.".Localize(), ErrorLevel = ValidationErrorLevel.Warning, }); diff --git a/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs b/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs index 39e104658..a2d612419 100644 --- a/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs +++ b/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs @@ -683,8 +683,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration uiField = new DoubleOrPercentField(theme); break; - case SliceSettingData.DataEditTypes.POSITIVE_DOUBLE_OR_INCOMPATABLE: - uiField = new DoubleOrIncompatable(theme); + case SliceSettingData.DataEditTypes.POSITIVE_DOUBLE_OR_INCOMPATIBLE: + uiField = new DoubleOrIncompatible(theme); break; case SliceSettingData.DataEditTypes.INT_OR_MM: diff --git a/MatterControlLib/SlicerConfiguration/UIFields/DoubleOrIncompatable.cs b/MatterControlLib/SlicerConfiguration/UIFields/DoubleOrIncompatible.cs similarity index 95% rename from MatterControlLib/SlicerConfiguration/UIFields/DoubleOrIncompatable.cs rename to MatterControlLib/SlicerConfiguration/UIFields/DoubleOrIncompatible.cs index 96ccadf23..99287926c 100644 --- a/MatterControlLib/SlicerConfiguration/UIFields/DoubleOrIncompatable.cs +++ b/MatterControlLib/SlicerConfiguration/UIFields/DoubleOrIncompatible.cs @@ -31,9 +31,9 @@ using System; namespace MatterHackers.MatterControl.SlicerConfiguration { - public class DoubleOrIncompatable : TextField + public class DoubleOrIncompatible : TextField { - public DoubleOrIncompatable(ThemeConfig theme) + public DoubleOrIncompatible(ThemeConfig theme) : base(theme) { } diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index dec590da7..b5824a230 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit dec590da7530f63c5bbaea1ff75eacc78b34a994 +Subproject commit b5824a2309f04f710250bd75dfb2f5cfada5a7bc