From 41475ff243d53199b7efff545e904cdfaf85d145 Mon Sep 17 00:00:00 2001
From: Kostas Karmas <konskarm@gmail.com>
Date: Thu, 13 Aug 2020 15:28:59 +0200
Subject: [PATCH] Remove bead_width in favor of wall_line_width

CURA-7555
---
 resources/definitions/fdmprinter.def.json | 75 +++++++++++------------
 1 file changed, 35 insertions(+), 40 deletions(-)

diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index 81f3bdff00..2df5f04c3d 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -1070,25 +1070,12 @@
                     "limit_to_extruder": "wall_0_extruder_nr",
                     "children":
                     {
-                        "bead_width":
-                        {
-                            "label": "Bead Width",
-                            "description": "Bead Width.",
-                            "unit": "mm",
-                            "value": "line_width",
-                            "minimum_value": "0.001",
-                            "minimum_value_warning": "0.1 + 0.4 * machine_nozzle_size",
-                            "maximum_value_warning": "2 * machine_nozzle_size",
-                            "type": "float",
-                            "limit_to_extruder": "wall_0_extruder_nr",
-                            "enabled": "beading_strategy_type != 'naive'"
-                        },
                         "transitioning_angle":
                         {
                             "label": "Transitioning Angle",
                             "description": "Transitioning Angle.",
                             "unit": "°",
-                            "default_value": 45,
+                            "default_value": 30,
                             "minimum_value": "1",
                             "minimum_value_warning": "22.5",
                             "maximum_value": "89",
@@ -1102,26 +1089,20 @@
                             "description": "Transition Length.",
                             "unit": "mm",
                             "default_value": 0.4,
-                            "value": "line_width * 2",
+                            "value": "wall_line_width * 2",
                             "minimum_value": "0",
-                            "maximum_value_warning": "line_width * 5",
+                            "maximum_value_warning": "wall_line_width * 5",
                             "type": "float",
                             "minimum_value_warning": "0.01",
                             "limit_to_extruder": "wall_0_extruder_nr",
                             "enabled": "beading_strategy_type == 'distributed' or beading_strategy_type == 'inward_distributed' or beading_strategy_type == 'limited_distributed'"
                         },
-                        "widening_mode":
+                        "widening_beading_enabled":
                         {
-                            "label": "Widening Mode",
-                            "description": "Widening Mode.",
-                            "type": "enum",
-                            "options":
-                            {
-                                "not_selected": "Not Selected",
-                                "min_bead_width_mode": "Minimum Bead Width Mode",
-                                "min_feature_size_mode": "Minimum Feature Size Mode"
-                            },
-                            "default_value": "not_selected",
+                            "label": "Enable Widening Beading",
+                            "description": "Applies the Widening Beading meta-strategy on top of the selected beading strategy.",
+                            "type": "bool",
+                            "default_value": false,
                             "limit_to_extruder": "wall_0_extruder_nr",
                             "children":
                             {
@@ -1130,35 +1111,49 @@
                                     "label": "Minimum Bead Width",
                                     "description": "Minimum Bead Width.",
                                     "unit": "mm",
-                                    "value": "bead_width / 2",
+                                    "value": "wall_line_width / 2 if widening_beading_enabled else 0",
                                     "minimum_value": "0",
-                                    "maximum_value_warning": "bead_width",
+                                    "minimum_value_warning": "wall_line_width / 2",
+                                    "maximum_value": "wall_line_width",
                                     "type": "float",
                                     "limit_to_extruder": "wall_0_extruder_nr",
-                                    "enabled": "widening_mode == 'min_bead_width_mode'"
+                                    "enabled": "widening_beading_enabled"
                                 },
                                 "min_feature_size":
                                 {
                                     "label": "Minimum Feature Size",
                                     "description": "Minimum Feature Size.",
                                     "unit": "mm",
-                                    "value": "bead_width / 2",
+                                    "value": "wall_line_width / 2 if widening_beading_enabled else 0",
                                     "minimum_value": "0",
-                                    "maximum_value_warning": "bead_width",
+                                    "minimum_value_warning": "wall_line_width / 2",
+                                    "maximum_value": "wall_line_width",
                                     "type": "float",
                                     "limit_to_extruder": "wall_0_extruder_nr",
-                                    "enabled": "widening_mode == 'min_feature_size_mode'"
+                                    "enabled": "widening_beading_enabled"
                                 }
                             }
                         },
-                        "max_bead_count":
+                        "limited_beading_enabled":
                         {
-                            "label": "Maximum Bead Count",
-                            "description": "Maximum Bead Count. If >=1, the Limited Beading Meta-Strategy is applied on top of the selected Beading Strategy.",
-                            "default_value": 0,
-                            "minimum_value": "0",
-                            "type": "int",
-                            "limit_to_extruder": "wall_0_extruder_nr"
+                            "label": "Enable Limited Beading",
+                            "description": "Applies the Limited Beading meta-strategy on top of the selected beading strategy.",
+                            "type": "bool",
+                            "default_value": false,
+                            "limit_to_extruder": "wall_0_extruder_nr",
+                            "children":
+                            {
+                                "max_bead_count":
+                                {
+                                    "label": "Maximum Bead Count",
+                                    "description": "Maximum Bead Count used in the limited beading meta-strategy. Even numbers only.",
+                                    "value": "wall_line_count * 2",
+                                    "minimum_value": "2",
+                                    "type": "int",
+                                    "limit_to_extruder": "wall_0_extruder_nr",
+                                    "enabled": "limited_beading_enabled"
+                                }
+                            }
                         }
                     }
                 },