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

Put in the ability to turn off Merge Overlapping Lines

Browse source 
Fixes a possible regression in slicing
This commit is contained in:
Lars Brubaker 2016-10-27 18:36:02 -07:00
parent 1f00e57088
commit a22ef1d32b
7 changed files with 41 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
SlicerConfiguration/Settings/SettingsHelpers.cs
View file

@ -61,6 +61,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public const string device_token = nameof(device_token);
public const string device_type = nameof(device_type);
public const string expand_thin_walls = nameof(expand_thin_walls);
public const string merge_overlapping_lines = nameof(merge_overlapping_lines);
public const string extruder_count = nameof(extruder_count);
public const string extruders_share_temperature = nameof(extruders_share_temperature);
public const string filament_cost = nameof(filament_cost);

1
SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs
View file

@ -118,6 +118,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
new MappedToBoolString("wipe", "wipeAfterRetraction"),
new MappedToBoolString(SettingsKey.center_part_on_bed, "centerObjectInXy"),
new MappedToBoolString(SettingsKey.expand_thin_walls, "expandThinWalls"),
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"),

1
SlicerConfiguration/SlicerMapping/EngineMappingSlic3r.cs
View file

@ -49,6 +49,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
hiddenSettings.Add("support_material_z_distance");
hiddenSettings.Add(SettingsKey.center_part_on_bed);
hiddenSettings.Add(SettingsKey.expand_thin_walls);
hiddenSettings.Add(SettingsKey.merge_overlapping_lines);
hiddenSettings.Add(SettingsKey.fill_thin_gaps);
hiddenSettings.Add("infill_overlap_perimeter");
hiddenSettings.Add("support_type");

1
StaticData/SliceSettings/Layouts.txt
View file

@ -89,6 +89,7 @@ Advanced
randomize_start
external_perimeters_first
perimeter_start_end_overlap
merge_overlapping_lines
expand_thin_walls
Outer Surface - Top & Bottom
top_solid_layers

46
StaticData/SliceSettings/Properties.json
View file

@ -460,25 +460,25 @@
"DefaultValue": "0",
"ReloadUiWhenChanged": true
},
{
"QuickMenuSettings": [ ],
"SetSettingsOnChange": [ ],
"SlicerConfigName": "heat_extruder_before_homing",
"PresentationName": "Heat Before Homing",
"HelpText": "Forces the printer to heat the nozzle before homing.",
"DataEditType": "CHECK_BOX",
"ExtraSettings": "",
"ShowAsOverride": true,
"ShowIfSet": null,
"ResetAtEndOfPrint": false,
"DefaultValue": "0"
},
{
"QuickMenuSettings": [ ],
"SetSettingsOnChange": [ ],
"SlicerConfigName": "heat_extruder_before_homing",
"PresentationName": "Heat Before Homing",
"HelpText": "Forces the printer to heat the nozzle before homing.",
"DataEditType": "CHECK_BOX",
"ExtraSettings": "",
"ShowAsOverride": true,
"ShowIfSet": null,
"ResetAtEndOfPrint": false,
"DefaultValue": "0"
},
{
"QuickMenuSettings": [ ],
"SetSettingsOnChange": [ ],
"SlicerConfigName": "expand_thin_walls",
"PresentationName": "Expand Thin Walls",
"HelpText": "Detect sections of the model that would be too thin to print, expand them, and print them.",
"SlicerConfigName": "merge_overlapping_lines",
"PresentationName": "Merge Overlapping Lines",
"HelpText": "Detect perimeters that cross over themselves and combine them.",
"DataEditType": "CHECK_BOX",
"ExtraSettings": "",
"ShowAsOverride": true,
@ -487,6 +487,20 @@
"DefaultValue": "1",
"RebuildGCodeOnChange": true
},
{
"QuickMenuSettings": [ ],
"SetSettingsOnChange": [ ],
"SlicerConfigName": "expand_thin_walls",
"PresentationName": "Expand Thin Walls",
"HelpText": "Detect sections of the model that would be too thin to print, expand them, and print them.",
"DataEditType": "CHECK_BOX",
"ExtraSettings": "",
"ShowAsOverride": true,
"ShowIfSet": null,
"ResetAtEndOfPrint": false,
"DefaultValue": "1",
"RebuildGCodeOnChange": true
},
{
"QuickMenuSettings": [ ],
"SetSettingsOnChange": [ ],

6
StaticData/Translations/Master.txt
View file

@ -5536,3 +5536,9 @@ Translated:Are you sure you want exit while a print is running from SD Card?\n\n
English:Connect printer and power on
Translated:Connect printer and power on
English:Detect perimeters that cross over themselves and combine them.
Translated:Detect perimeters that cross over themselves and combine them.
English:Merge Overlapping Lines
Translated:Merge Overlapping Lines

2
Submodules/MatterSlice

@ -1 +1 @@
Subproject commit 32dc44ffb5fae2d2dd149202d6be8df0629d1fcd
Subproject commit f4210f0623ebb19add0975a6dc434ff0564b6a80