From a43dcdd63f8275cc86cb0d2b85332c55b732736e Mon Sep 17 00:00:00 2001 From: larsbrubaker Date: Tue, 25 Mar 2014 14:10:26 -0700 Subject: [PATCH] Cleaning up some settings names and organization. Added bed size to MatterSlice settings --- .../SlicerMapping/EngineMappingMatterSlice.cs | 2 ++ StaticData/SliceSettings/Layouts.txt | 16 ++++++++-------- StaticData/SliceSettings/Properties.txt | 4 ++-- StaticData/Translations/Master.txt | 12 ++++++++++++ 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs b/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs index 59d9e0ddd..3d2b4eded 100644 --- a/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs +++ b/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs @@ -229,10 +229,12 @@ namespace MatterHackers.MatterControl.SlicerConfiguration //wipeTowerSize=0 # Unlike the wipe shield this is a square of size X size in the lower left corner for wiping during extruder changing. + new NotPassedItem("", "pause_gcode"), new NotPassedItem("", "resume_gcode"), new NotPassedItem("", "cancel_gcode"), + new NotPassedItem("", "bed_size"), new NotPassedItem("", "build_height"), new NotPassedItem("", "temperature"), diff --git a/StaticData/SliceSettings/Layouts.txt b/StaticData/SliceSettings/Layouts.txt index 96e4aee27..8e65b8459 100644 --- a/StaticData/SliceSettings/Layouts.txt +++ b/StaticData/SliceSettings/Layouts.txt @@ -3,7 +3,7 @@ Beginner Layers/Perimeters Layer Height layer_height - Vertical Shells + Perimeters perimeters Infill Infill @@ -43,22 +43,22 @@ Advanced Layer Height layer_height first_layer_height - Vertical Shells + bottom_clip_amount + Perimeters perimeters + avoid_crossing_perimeters spiral_vase - Horizontal Shells + Top & Bottom Layers top_solid_layers bottom_solid_layers Quality extra_perimeters - avoid_crossing_perimeters start_perimeters_at_concave_points start_perimeters_at_non_overhang thin_walls Advanced randomize_start external_perimeters_first - bottom_clip_amount Infill Infill fill_density @@ -75,12 +75,12 @@ Advanced infill_overlap_perimeter Speed Speed for Print Moves - perimeter_speed - small_perimeter_speed - external_perimeter_speed infill_speed solid_infill_speed top_solid_infill_speed + perimeter_speed + small_perimeter_speed + external_perimeter_speed support_material_speed bridge_speed gap_fill_speed diff --git a/StaticData/SliceSettings/Properties.txt b/StaticData/SliceSettings/Properties.txt index 4d05ca6f8..5faa71ceb 100644 --- a/StaticData/SliceSettings/Properties.txt +++ b/StaticData/SliceSettings/Properties.txt @@ -30,7 +30,7 @@ extrusion_width|Default Extrusion Width|DOUBLE_OR_PERCENT|mm or %\nleave 0 for a fan_always_on|Keep Fan Always On|CHECK_BOX||This will force the fan to remain on throughout the print. In general you should have this off and just enable auto cooling. fan_below_layer_time|Enable Fan If Layer\nPrint Time Is Below|INT|Seconds|If a layer is estimated to take less than this to print, the fan will be turned on. filament_diameter|Diameter|POSITIVE_DOUBLE|mm|This should be set to the actual diameter of the filament you are using on your printer. Measure 5 times with calipers, throw out the top and bottom, and average the remaining 3. -fill_angle|Fill Angle|POSITIVE_DOUBLE|Angle Degrees|Sets the starting angle of the infill. Not used when bridging. +fill_angle|Starting Angle|POSITIVE_DOUBLE|degrees|Sets the starting angle of the infill. Not used when bridging. fill_density|Fill Density|POSITIVE_DOUBLE|Ratio (0 to 1)|The ratio of material to empty space ranged 0 to 1. Zero would be no infill; 1 is solid infill. fill_pattern|Fill Pattern|LIST|rectilinear,line,concentric,honeycomb,hilbertcurve,achimedeancords,octagramspiral|The pattern used on the inside portions of the print. first_layer_acceleration|First Layer|DOUBLE|mm/s|Acceleration to use while printing the first layer. Set to 0 to the default first layer acceleration. @@ -102,7 +102,7 @@ standby_temperature_delta|Temp Lower Amount|DOUBLE|degrees|This is the amount to start_gcode|Start G-Code|MULTI_LINE_TEXT||This gcode will be inserted into the output right after the temperature setting. If you have the commands to set temperature in this section they will not be generated outside of this section. You can also include values from other settings such as [first_layer_temperature]. start_perimeters_at_concave_points|Start At Concave Points|CHECK_BOX||Make sure the first point on a perimeter is a concave point. start_perimeters_at_non_overhang|Start At Non Overhang|CHECK_BOX||Make sure the first point on a perimeter is not an overhang. -support_material_angle|Pattern Angle|POSITIVE_DOUBLE|degrees|The starting angle of the supports. +support_material_angle|Starting Angle|POSITIVE_DOUBLE|degrees|The starting angle of the supports. support_material_create_internal_support|Internal Support|CHECK_BOX||Create support where needed on internal features. support_material_enforce_layers|Enforce Support For First|INT|layers|Generate support material everywhere not touching the bed for n layers, regardless of angle. support_material_extruder|Support Material Extruder|INT||The index of the extruder to use for support material. diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index 7f35b2aa9..1dc2acbd4 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -1557,3 +1557,15 @@ Translated:The type of support to create for surfaces that need it. English:Support Type Translated:Support Type +English:Top & Bottom Layers +Translated:Top & Bottom Layers + +English: +Translated: + +English:gcode_output_type +Translated:gcode_output_type + +English:Starting Angle +Translated:Starting Angle +