diff --git a/DataStorage/Classic/ClassicSqlitePrinterProfiles.cs b/DataStorage/Classic/ClassicSqlitePrinterProfiles.cs index 94ffde186..a8e938026 100644 --- a/DataStorage/Classic/ClassicSqlitePrinterProfiles.cs +++ b/DataStorage/Classic/ClassicSqlitePrinterProfiles.cs @@ -134,7 +134,6 @@ namespace MatterHackers.MatterControl.DataStorage.ClassicDB // make sure we clear the one time settings printerSettings.OemLayer[SettingsKey.spiral_vase] = ""; - printerSettings.OemLayer[SettingsKey.bottom_clip_amount] = ""; printerSettings.OemLayer[SettingsKey.layer_to_pause] = ""; // TODO: Where can we find CalibrationFiiles in the current model? diff --git a/SlicerConfiguration/Settings/SettingsHelpers.cs b/SlicerConfiguration/Settings/SettingsHelpers.cs index 69699cfb7..2bb35a9c9 100644 --- a/SlicerConfiguration/Settings/SettingsHelpers.cs +++ b/SlicerConfiguration/Settings/SettingsHelpers.cs @@ -53,7 +53,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration public const string bed_shape = nameof(bed_shape); public const string bed_size = nameof(bed_size); public const string bed_temperature = nameof(bed_temperature); - public const string bottom_clip_amount = nameof(bottom_clip_amount); public const string build_height = nameof(build_height); public const string cancel_gcode = nameof(cancel_gcode); public const string com_port = nameof(com_port); diff --git a/SlicerConfiguration/SlicerMapping/EngineMappingCura.cs b/SlicerConfiguration/SlicerMapping/EngineMappingCura.cs index 1fc192242..dc48b81c6 100644 --- a/SlicerConfiguration/SlicerMapping/EngineMappingCura.cs +++ b/SlicerConfiguration/SlicerMapping/EngineMappingCura.cs @@ -68,8 +68,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration new MappedSetting("perimeter_speed", "insetXSpeed"), new AsPercentOfReferenceOrDirect("external_perimeter_speed", "inset0Speed", "perimeter_speed"), - new ScaledSingleNumber(SettingsKey.bottom_clip_amount, "objectSink", 1000), - new MappedSetting("max_fan_speed", "fanSpeedMin"), new MappedSetting("min_fan_speed", "fanSpeedMax"), diff --git a/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs b/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs index 9a25faf18..5d1c6ca7c 100644 --- a/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs +++ b/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs @@ -103,7 +103,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration new MappedSetting("wipe_shield_distance", "wipeShieldDistanceFromObject"), new MappedSetting("wipe_tower_size", "wipeTowerSize"), new MappedSetting("z_offset", "zOffset"), - new MappedSetting(SettingsKey.bottom_clip_amount, "bottomClipAmount"), new MappedSetting(SettingsKey.filament_diameter, "filamentDiameter"), new MappedSetting(SettingsKey.layer_height, "layerThickness"), new MappedSetting(SettingsKey.nozzle_diameter, "extrusionWidth"), @@ -120,7 +119,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration new MappedToBoolString(SettingsKey.merge_overlapping_lines, "MergeOverlappingLines"), new MappedToBoolString(SettingsKey.fill_thin_gaps, "fillThinGaps"), new MappedToBoolString(SettingsKey.spiral_vase, "continuousSpiralOuterPerimeter"), - new MapPositionToPlaceObjectCenter(SettingsKey.print_center, "positionToPlaceObjectCenter"), new MapStartGCode(SettingsKey.start_gcode, "startCode", true), new MapLayerChangeGCode("layer_gcode", "layerChangeCode"), new ScaledSingleNumber("fill_density", "infillPercent", 100), @@ -252,24 +250,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration } } - public class MapPositionToPlaceObjectCenter : MappedSetting - { - public MapPositionToPlaceObjectCenter(string canonicalSettingsName, string exportedName) - : base(canonicalSettingsName, exportedName) - { - } - - public override string Value - { - get - { - Vector2 PrinteCenter = ActiveSliceSettings.Instance.GetValue(SettingsKey.print_center); - - return "[{0},{1}]".FormatWith(PrinteCenter.x, PrinteCenter.y); - } - } - } - public class SkirtLengthMapping : MappedSetting { public SkirtLengthMapping(string canonicalSettingsName, string exportedName) diff --git a/SlicerConfiguration/SlicerMapping/EngineMappingSlic3r.cs b/SlicerConfiguration/SlicerMapping/EngineMappingSlic3r.cs index aa7656ea7..245b17d79 100644 --- a/SlicerConfiguration/SlicerMapping/EngineMappingSlic3r.cs +++ b/SlicerConfiguration/SlicerMapping/EngineMappingSlic3r.cs @@ -65,7 +65,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration "infill_type", "create_raft", "z_gap", - SettingsKey.bottom_clip_amount, "gcode_output_type", "raft_extra_distance_around_part", "output_only_first_layer", diff --git a/StaticData/SliceSettings/Layouts.txt b/StaticData/SliceSettings/Layouts.txt index a7cc66e79..9ca941482 100644 --- a/StaticData/SliceSettings/Layouts.txt +++ b/StaticData/SliceSettings/Layouts.txt @@ -222,7 +222,6 @@ Advanced Single Print Settings Will Clear at End of Print spiral_vase - bottom_clip_amount layer_to_pause Filament Material diff --git a/StaticData/SliceSettings/Properties.json b/StaticData/SliceSettings/Properties.json index 28bf3b8ac..2a8ae35bd 100644 --- a/StaticData/SliceSettings/Properties.json +++ b/StaticData/SliceSettings/Properties.json @@ -32,15 +32,6 @@ "ShowIfSet": "has_heated_bed", "DefaultValue": "70" }, - { - "SlicerConfigName": "bottom_clip_amount", - "PresentationName": "Bottom Clip", - "HelpText": "The amount to remove from the bottom of the model, in millimeters.", - "DataEditType": "DOUBLE", - "ExtraSettings": "mm", - "ResetAtEndOfPrint": true, - "DefaultValue": "0" - }, { "SlicerConfigName": "bottom_solid_layers", "PresentationName": "Bottom Solid Layers:", diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice index a391321c3..719c7e00a 160000 --- a/Submodules/MatterSlice +++ b/Submodules/MatterSlice @@ -1 +1 @@ -Subproject commit a391321c371c27ae29f35451f626bfd5b39f7b4c +Subproject commit 719c7e00ae405655bc24152867c66eea5e0b671e