diff --git a/SlicerConfiguration/SliceSettingsOrganizer.cs b/SlicerConfiguration/SliceSettingsOrganizer.cs index e99f80a56..608ffa482 100644 --- a/SlicerConfiguration/SliceSettingsOrganizer.cs +++ b/SlicerConfiguration/SliceSettingsOrganizer.cs @@ -64,6 +64,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration public string ExtraSettings { get; set; } = ""; + public string ListValues { get; set; } = ""; + public bool ShowAsOverride { get; set; } = true; public List QuickMenuSettings = new List(); diff --git a/SlicerConfiguration/SliceSettingsWidget.cs b/SlicerConfiguration/SliceSettingsWidget.cs index fe5fdf3b2..c256f0a67 100644 --- a/SlicerConfiguration/SliceSettingsWidget.cs +++ b/SlicerConfiguration/SliceSettingsWidget.cs @@ -596,7 +596,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration case SliceSettingData.DataEditTypes.LIST: uiField = new ListField() { - ListItems = settingData.ExtraSettings.Split(',').ToList() + ListItems = settingData.ListValues.Split(',').ToList() }; break; diff --git a/StaticData/SliceSettings/Properties.json b/StaticData/SliceSettings/Properties.json index db840168f..8aaddb0d0 100644 --- a/StaticData/SliceSettings/Properties.json +++ b/StaticData/SliceSettings/Properties.json @@ -12,7 +12,7 @@ "PresentationName": "Bed Shape", "HelpText": "The shape of the physical print bed.", "DataEditType": "LIST", - "ExtraSettings": "rectangular,circular", + "ListValues": "rectangular,circular", "DefaultValue": "rectangular", "RebuildGCodeOnChange": false }, @@ -365,7 +365,7 @@ "PresentationName": "Fill Pattern", "HelpText": "The geometric shape of the support structure for the inside of parts.", "DataEditType": "LIST", - "ExtraSettings": "rectilinear,line,grid,concentric,honeycomb,hilbertcurve,achimedeancords,octagramspiral,3dhoneycomb", + "ListValues": "rectilinear,line,grid,concentric,honeycomb,hilbertcurve,achimedeancords,octagramspiral,3dhoneycomb", "DefaultValue": "honeycomb" }, { @@ -491,7 +491,7 @@ "PresentationName": "G-Code Flavor", "HelpText": "The version of G-Code the printer's firmware communicates with. Some firmware use different G and M codes. Setting this ensures that the output G-Code will use the correct commands.", "DataEditType": "LIST", - "ExtraSettings": "reprap,teacup,makerbot,sailfish,mach3_ecm,no_extrusion", + "ListValues": "reprap,teacup,makerbot,sailfish,mach3_ecm,no_extrusion", "DefaultValue": "reprap" }, { @@ -499,7 +499,7 @@ "PresentationName": "G-Code Output", "HelpText": "The version of G-Code the printer's firmware communicates with. Some firmware use different G and M codes. Setting this ensures that the output G-Code will use the correct commands.", "DataEditType": "LIST", - "ExtraSettings": "REPRAP,ULTIGCODE,BFB,MACH3", + "ListValues": "REPRAP,ULTIGCODE,BFB,MACH3", "DefaultValue": "REPRAP" }, { @@ -655,7 +655,7 @@ "PresentationName": "Infill Type", "HelpText": "The geometric shape of the support structure for the inside of parts.", "DataEditType": "LIST", - "ExtraSettings": "GRID,TRIANGLES,HEXAGON,LINES,CONCENTRIC", + "ListValues": "GRID,TRIANGLES,HEXAGON,LINES,CONCENTRIC", "DefaultValue": "TRIANGLES" }, { @@ -663,7 +663,7 @@ "PresentationName": "Leveling Solution", "HelpText": "The print leveling algorithm to use.", "DataEditType": "LIST", - "ExtraSettings": "3 Point Plane,7 Point Disk,13 Point Disk,3x3 Mesh", + "ListValues": "3 Point Plane,7 Point Disk,13 Point Disk,3x3 Mesh", "ShowAsOverride": true, "ShowIfSet": "!has_hardware_leveling", "DefaultValue": "3 Point Plane", @@ -1221,7 +1221,7 @@ "PresentationName": "Top/Bottom Fill Pattern", "HelpText": "The pattern used on the bottom and top layers of the print.", "DataEditType": "LIST", - "ExtraSettings": "rectilinear,concentric,hilbertcurve,achimedeancords,octagramspiral", + "ListValues": "rectilinear,concentric,hilbertcurve,achimedeancords,octagramspiral", "DefaultValue": "rectilinear" }, { @@ -1440,7 +1440,7 @@ "PresentationName": "Pattern", "HelpText": "The pattern to draw for the generation of support material.", "DataEditType": "LIST", - "ExtraSettings": "rectilinear,rectilinear-grid,honeycomb,pillars", + "ListValues": "rectilinear,rectilinear-grid,honeycomb,pillars", "DefaultValue": "honeycomb" }, { @@ -1526,7 +1526,7 @@ "DataEditType": "LIST", "EnableIfSet": "support_material", "ShowIfSet": "!sla_printer", - "ExtraSettings": "GRID,LINES", + "ListValues": "GRID,LINES", "DefaultValue": "LINES" }, {