From 092483cac5e7d6fb478502c3fca666d60627b905 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 15 Jun 2017 15:19:45 +0200 Subject: [PATCH] Rename setting ids for sanding to ironing This makes the code easier to follow since we consistently use the same terms for things in our code as what is user-visible. Contributes to issue CURA-3903. --- resources/definitions/fdmprinter.def.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 8cba7c1711..d3226361b7 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -2599,7 +2599,7 @@ "limit_to_extruder": "top_bottom_extruder_nr", "settable_per_mesh": true }, - "jerk_sanding": + "jerk_ironing": { "label": "Ironing Jerk", "description": "The maximum instantaneous velocity change while performing ironing.", @@ -2609,7 +2609,7 @@ "maximum_value_warning": "50", "default_value": 20, "value": "jerk_topbottom", - "enabled": "resolveOrValue('jerk_enabled') and sanding_enabled", + "enabled": "resolveOrValue('jerk_enabled') and ironing_enabled", "limit_to_extruder": "top_bottom_extruder_nr", "settable_per_mesh": true }, @@ -5385,7 +5385,7 @@ "settable_per_extruder": false, "settable_per_meshgroup": false }, - "sanding_enabled": + "ironing_enabled": { "label": "Enable Ironing", "description": "Go over the top surface one additional time, but without extruding material. This is meant to melt the plastic on top further, creating a smoother surface.", @@ -5394,7 +5394,7 @@ "limit_to_extruder": "top_bottom_extruder_nr", "settable_per_mesh": true }, - "sanding_pattern": + "ironing_pattern": { "label": "Ironing Pattern", "description": "The pattern to use for ironing top surfaces.", @@ -5405,11 +5405,11 @@ "zigzag": "Zig Zag" }, "default_value": "zigzag", - "enabled": "sanding_enabled", + "enabled": "ironing_enabled", "limit_to_extruder": "top_bottom_extruder_nr", "settable_per_mesh": true }, - "sanding_line_spacing": + "ironing_line_spacing": { "label": "Ironing Line Spacing", "description": "The distance between the lines of ironing.", @@ -5418,11 +5418,11 @@ "default_value": 0.1, "minimum_value": "0.001", "maximum_value_warning": "machine_nozzle_tip_outer_diameter", - "enabled": "sanding_enabled", + "enabled": "ironing_enabled", "limit_to_extruder": "top_bottom_extruder_nr", "settable_per_mesh": true }, - "sanding_flow": + "ironing_flow": { "label": "Ironing Flow", "description": "The amount of material, relative to a normal skin line, to extrude during ironing. Keeping the nozzle filled helps filling some of the crevices of the top surface, but too much results in overextrusion and blips on the side of the surface.", @@ -5431,11 +5431,11 @@ "default_value": 10.0, "minimum_value": "0", "maximum_value_warning": "50", - "enabled": "sanding_enabled", + "enabled": "ironing_enabled", "limit_to_extruder": "top_bottom_extruder_nr", "settable_per_mesh": true }, - "sanding_inset": + "ironing_inset": { "label": "Ironing Inset", "description": "A distance to keep from the edges of the model. Ironing all the way to the edge of the mesh may result in a jagged edge on your print.", @@ -5445,7 +5445,7 @@ "value": "wall_line_width_0 / 2", "minimum_value_warning": "0", "maximum_value_warning": "wall_line_width_0", - "enabled": "sanding_enabled", + "enabled": "ironing_enabled", "limit_to_extruder": "top_bottom_extruder_nr", "settable_per_mesh": true }