nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adding ability to specify "Not Compatible" bed temperature in material settings

Browse source 
Adding 'NC' to many material settings
Require bed temps for all bed types in all materials
This commit is contained in:
Lars Brubaker 2022-03-25 09:53:43 -07:00
parent fd397f2e65
commit 1b59d871c5
48 changed files with 462 additions and 332 deletions
Download patch file Download diff file Expand all files Collapse all files

1
MatterControl.Printing/Settings/SliceSettingData.cs
View file

@ -63,6 +63,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
OFFSET,
OFFSET3,
POSITIVE_DOUBLE,
POSITIVE_DOUBLE_OR_INCOMPATABLE,
READONLY_STRING,
SLICE_ENGINE,
STRING,

28
MatterControl.Printing/Settings/SliceSettingsFields.cs
View file

@ -139,8 +139,8 @@ 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.".Localize(),
DataEditType = DataEditTypes.POSITIVE_DOUBLE,
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,
Units = "°C".Localize(),
Show = (settings) => settings.GetBool(SettingsKey.has_heated_bed)
&& settings.GetBool(SettingsKey.has_swappable_bed),
@ -150,8 +150,8 @@ 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.".Localize(),
DataEditType = DataEditTypes.POSITIVE_DOUBLE,
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,
Units = "°C".Localize(),
Show = (settings) => settings.GetBool(SettingsKey.has_heated_bed)
&& settings.GetBool(SettingsKey.has_swappable_bed),
@ -161,8 +161,8 @@ 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.".Localize(),
DataEditType = DataEditTypes.POSITIVE_DOUBLE,
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,
Units = "°C".Localize(),
Show = (settings) => settings.GetBool(SettingsKey.has_heated_bed)
&& settings.GetBool(SettingsKey.has_swappable_bed),
@ -172,8 +172,8 @@ 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.".Localize(),
DataEditType = DataEditTypes.POSITIVE_DOUBLE,
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,
Units = "°C".Localize(),
Show = (settings) => settings.GetBool(SettingsKey.has_heated_bed)
&& settings.GetBool(SettingsKey.has_swappable_bed),
@ -183,8 +183,8 @@ 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.".Localize(),
DataEditType = DataEditTypes.POSITIVE_DOUBLE,
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,
Units = "°C".Localize(),
Show = (settings) => settings.GetBool(SettingsKey.has_heated_bed)
&& settings.GetBool(SettingsKey.has_swappable_bed),
@ -194,8 +194,8 @@ 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.".Localize(),
DataEditType = DataEditTypes.POSITIVE_DOUBLE,
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,
Units = "°C".Localize(),
Show = (settings) => settings.GetBool(SettingsKey.has_heated_bed)
&& settings.GetBool(SettingsKey.has_swappable_bed),
@ -205,8 +205,8 @@ 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.".Localize(),
DataEditType = DataEditTypes.POSITIVE_DOUBLE,
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,
Units = "°C".Localize(),
Show = (settings) => settings.GetBool(SettingsKey.has_heated_bed)
&& settings.GetBool(SettingsKey.has_swappable_bed),

7
MatterControl.Printing/Settings/ValidationError.cs
View file

@ -59,16 +59,17 @@ namespace MatterHackers.MatterControl
public static class ValidationErrors
{
public static readonly string BedLevelingTemperature = nameof(BedLevelingTemperature);
public static readonly string BedLevelingMesh = nameof(BedLevelingMesh);
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 ItemCannotBeExported = nameof(ItemCannotBeExported);
public static readonly string ItemToAMFExportInvalid = nameof(ItemToAMFExportInvalid);
public static readonly string ItemToSTLExportInvalid = nameof(ItemToSTLExportInvalid);
public static readonly string MaterialNotSelected = nameof(MaterialNotSelected);
public static readonly string NoItemsToExport = nameof(NoItemsToExport);
public static readonly string NoPrintableParts = nameof(NoPrintableParts);
public static readonly string BedSurfaceNotSelected = nameof(BedSurfaceNotSelected);
public static readonly string MaterialNotSelected = nameof(MaterialNotSelected);
public static readonly string NoZipItemsToExport = nameof(NoZipItemsToExport);
public static readonly string PrinterDisconnected = nameof(PrinterDisconnected);
public static readonly string PrinterSetupRequired = nameof(PrinterSetupRequired);