From f7e0adc1bbd44a80cb222fc2d6eeb27f54b554c8 Mon Sep 17 00:00:00 2001 From: larsbrubaker Date: Wed, 29 Oct 2014 12:37:05 -0700 Subject: [PATCH] Took out repair_overlaps --- .../SlicerMapping/EngineMappingCura.cs | 1 - .../SlicerMapping/EngineMappingMatterSlice.cs | 37 ------------------- .../SlicerMapping/EngineMappingSlic3r.cs | 2 - StaticData/PrinterSettings/config.ini | 2 - StaticData/SliceSettings/Layouts.txt | 3 -- StaticData/SliceSettings/Properties.txt | 2 - 6 files changed, 47 deletions(-) diff --git a/SlicerConfiguration/SlicerMapping/EngineMappingCura.cs b/SlicerConfiguration/SlicerMapping/EngineMappingCura.cs index c8ad50d2d..e8d50e52e 100644 --- a/SlicerConfiguration/SlicerMapping/EngineMappingCura.cs +++ b/SlicerConfiguration/SlicerMapping/EngineMappingCura.cs @@ -95,7 +95,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration new NotPassedItem("", "temperature"), new NotPassedItem("", "bed_temperature"), new NotPassedItem("", "bed_shape"), - new NotPassedItem("", "extruder_count"), #if true new NotPassedItem("", "has_fan"), diff --git a/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs b/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs index 8ae37704f..ff1ddc385 100644 --- a/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs +++ b/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs @@ -211,10 +211,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration new NotPassedItem("", "z_can_be_negative"), #endif - //repairOverlaps=NONE # Available Values: NONE, REVERSE_ORIENTATION, UNION_ALL_TOGETHER # You can or them together using '|'. - new MapRepairOverlaps("repairOverlaps", "repair_overlaps_reverse_orientation"), - new NotPassedItem("", "repair_overlaps_union_all_together"), - //retractionOnExtruderSwitch=14.5 new MapItem("retractionOnExtruderSwitch", "retract_length_tool_change"), @@ -406,39 +402,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration } } - //repairOverlaps=NONE # Available Values: NONE, REVERSE_ORIENTATION, UNION_ALL_TOGETHER # You can or them together using '|'. - public class MapRepairOverlaps : MapItem - { - public override string MappedValue - { - get - { - if(ActiveSliceSettings.Instance.GetActiveValue("repair_overlaps_reverse_orientation") == "1") - { - if (ActiveSliceSettings.Instance.GetActiveValue("repair_overlaps_union_all_together") == "1") - { - return "REVERSE_ORIENTATION|UNION_ALL_TOGETHER"; - } - else - { - return "REVERSE_ORIENTATION"; - } - } - else if(ActiveSliceSettings.Instance.GetActiveValue("repair_overlaps_union_all_together") == "1") - { - return "UNION_ALL_TOGETHER"; - } - - return "NONE"; - } - } - - public MapRepairOverlaps(string mappedKey, string originalKey) - : base(mappedKey, originalKey) - { - } - } - public class FanTranslator : MapItem { public override string MappedValue diff --git a/SlicerConfiguration/SlicerMapping/EngineMappingSlic3r.cs b/SlicerConfiguration/SlicerMapping/EngineMappingSlic3r.cs index 57c84d248..4ce47d7ef 100644 --- a/SlicerConfiguration/SlicerMapping/EngineMappingSlic3r.cs +++ b/SlicerConfiguration/SlicerMapping/EngineMappingSlic3r.cs @@ -71,8 +71,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration hideItems.Add("raft_air_gap"); hideItems.Add("repair_outlines_extensive_stitching"); hideItems.Add("repair_outlines_keep_open"); - hideItems.Add("repair_overlaps_reverse_orientation"); - hideItems.Add("repair_overlaps_union_all_together"); hideItems.Add("complete_objects"); hideItems.Add("output_filename_format"); hideItems.Add("post_process"); diff --git a/StaticData/PrinterSettings/config.ini b/StaticData/PrinterSettings/config.ini index 899806658..9042ef1ce 100644 --- a/StaticData/PrinterSettings/config.ini +++ b/StaticData/PrinterSettings/config.ini @@ -89,8 +89,6 @@ raft_print_speed = 100% randomize_start = 0 repair_outlines_extensive_stitching = 0 repair_outlines_keep_open = 0 -repair_overlaps_reverse_orientation = 0 -repair_overlaps_union_all_together = 0 resolution = 0 resume_gcode = retract_before_travel = 2 diff --git a/StaticData/SliceSettings/Layouts.txt b/StaticData/SliceSettings/Layouts.txt index 8ba2d412e..18ca86a52 100644 --- a/StaticData/SliceSettings/Layouts.txt +++ b/StaticData/SliceSettings/Layouts.txt @@ -139,9 +139,6 @@ Advanced Outlines repair_outlines_extensive_stitching repair_outlines_keep_open - Overlaps - repair_overlaps_reverse_orientation - repair_overlaps_union_all_together Notes Notes notes diff --git a/StaticData/SliceSettings/Properties.txt b/StaticData/SliceSettings/Properties.txt index 0323bfd80..40c50ee39 100644 --- a/StaticData/SliceSettings/Properties.txt +++ b/StaticData/SliceSettings/Properties.txt @@ -99,8 +99,6 @@ retract_restart_extra|Extra Length On Restart|POSITIVE_DOUBLE|mm|The amount of e retract_speed|Speed|POSITIVE_DOUBLE|mm/s|The speed that the filament will be retracted (and re-extruded). repair_outlines_extensive_stitching|Connect Bad Edges|CHECK_BOX||Try to connect mesh edges when the actual mesh data is not all the way connected. repair_outlines_keep_open|Close Polygons|CHECK_BOX||Sometime a mesh will not have closed a perimeters. When this is checked these non-closed perimeters while be closed. -repair_overlaps_reverse_orientation|Reverse Orientation|CHECK_BOX||Reverse the orientation of overlaps. This can make some unintended holes go away. -repair_overlaps_union_all_together|Merge All|CHECK_BOX||Make all overlap areas into one big area. This can make some unintended holes go away.. resolution|Resolution|POSITIVE_DOUBLE|mm|The minimum feature size to consider from the model. Leave at 0 to use all the model detail. skirt_distance|Distance from Object|POSITIVE_DOUBLE|mm|The distance to start drawing the first skirt loop. Make this 0 to create an anchor for the part to the bed. skirt_height|Skirt Height|INT|layers|The number of layers to draw the skirt.