From e70bfc99773e157132f1a60e2f3d31e3edbdfcd7 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Sun, 6 Jan 2019 11:33:06 -0800 Subject: [PATCH] Move create_raft to SettingsKey --- MatterControl.Printing/Settings/SettingsKey.cs | 1 + .../PartPreviewWindow/View3D/PrinterBar/PrintPopupMenu.cs | 2 +- .../SlicerConfiguration/EngineMappingMatterSlice.cs | 2 +- MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs | 2 +- MatterControlLib/SlicerConfiguration/Slicer.cs | 2 +- Tests/MatterControl.AutomationTests/SliceSettingsTests.cs | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/MatterControl.Printing/Settings/SettingsKey.cs b/MatterControl.Printing/Settings/SettingsKey.cs index d1f50174c..f175a9527 100644 --- a/MatterControl.Printing/Settings/SettingsKey.cs +++ b/MatterControl.Printing/Settings/SettingsKey.cs @@ -163,5 +163,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration public const string support_material_speed = nameof(support_material_speed); public const string travel_speed = nameof(travel_speed); public const string retract_speed = nameof(retract_speed); + public const string create_raft = nameof(create_raft); } } diff --git a/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrintPopupMenu.cs b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrintPopupMenu.cs index fcf984825..efd3bb420 100644 --- a/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrintPopupMenu.cs +++ b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrintPopupMenu.cs @@ -96,7 +96,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow }; column.AddChild(optionsPanel); - foreach (var key in new[] { "layer_height", "fill_density", "create_raft"}) + foreach (var key in new[] { "layer_height", "fill_density", SettingsKey.create_raft }) { var settingsData = SettingsOrganizer.Instance.GetSettingsData(key); var row = SliceSettingsTabView.CreateItemRow(settingsData, settingsContext, printer, menuTheme, ref tabIndex, allUiFields); diff --git a/MatterControlLib/SlicerConfiguration/EngineMappingMatterSlice.cs b/MatterControlLib/SlicerConfiguration/EngineMappingMatterSlice.cs index 3d2fb8a45..1365e64e3 100644 --- a/MatterControlLib/SlicerConfiguration/EngineMappingMatterSlice.cs +++ b/MatterControlLib/SlicerConfiguration/EngineMappingMatterSlice.cs @@ -208,7 +208,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration new MappedSetting(printer, SettingsKey.nozzle_diameter, "extrusionWidth"), new MappedSetting(printer, "extruder_count", "extruderCount"), new MappedToBoolString(printer, "avoid_crossing_perimeters", "avoidCrossingPerimeters"), - new MappedToBoolString(printer, "create_raft", "enableRaft"), + new MappedToBoolString(printer, SettingsKey.create_raft, "enableRaft"), new MappedToBoolString(printer, "external_perimeters_first", "outsidePerimetersFirst"), new MappedToBoolString(printer, "output_only_first_layer", "outputOnlyFirstLayer"), new MappedToBoolString(printer, "retract_when_changing_islands", "retractWhenChangingIslands"), diff --git a/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs b/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs index 8aa1cebe6..9596aeafc 100644 --- a/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs +++ b/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs @@ -370,7 +370,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration private Dictionary toggleSwitchSectionKeys = new Dictionary { { "Skirt", "create_skirt" }, - { "Raft", "create_raft" }, + { "Raft", SettingsKey.create_raft }, { "Brim", "create_brim" }, { "Retraction", "enable_retractions" }, { "Fan", "enable_fan" }, diff --git a/MatterControlLib/SlicerConfiguration/Slicer.cs b/MatterControlLib/SlicerConfiguration/Slicer.cs index 6404a1fbb..410415618 100644 --- a/MatterControlLib/SlicerConfiguration/Slicer.cs +++ b/MatterControlLib/SlicerConfiguration/Slicer.cs @@ -79,7 +79,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration } // If we have raft enabled and are using an extruder other than 0 for it - if (printer.Settings.GetValue("create_raft")) + if (printer.Settings.GetValue(SettingsKey.create_raft)) { if (printer.Settings.GetValue("raft_extruder") != 0) { diff --git a/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs b/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs index 76caeaebc..c60ec1df9 100644 --- a/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs +++ b/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs @@ -30,7 +30,7 @@ namespace MatterHackers.MatterControl.Tests.Automation testRunner.AddItemToBedplate("", "Row Item Rook"); testRunner.SwitchToSliceSettings(); - testRunner.SelectSliceSettingsField(SettingsOrganizer.Instance.SliceSettings, "create_raft"); + testRunner.SelectSliceSettingsField(SettingsOrganizer.Instance.SliceSettings, SettingsKey.create_raft); testRunner.Delay(.5); testRunner.StartSlicing();