From 563bd1ddb55dfc9dd86bae180eeafc102359aad6 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 12 Feb 2016 11:11:18 +0100 Subject: [PATCH 1/9] Fix setting for show overhang For some reason the setting was inverted. Also, someone forgot to take the case into account where the setting exists but is None (which is the case when the setting is False). Fixes issue CURA-308. --- plugins/SolidView/SolidView.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/SolidView/SolidView.py b/plugins/SolidView/SolidView.py index beb2780d14..d9895e1d06 100644 --- a/plugins/SolidView/SolidView.py +++ b/plugins/SolidView/SolidView.py @@ -37,10 +37,12 @@ class SolidView(View): if Application.getInstance().getMachineManager().getWorkingProfile(): profile = Application.getInstance().getMachineManager().getWorkingProfile() - if profile.getSettingValue("support_enable") or not Preferences.getInstance().getValue("view/show_overhang"): + if Preferences.getInstance().getValue("view/show_overhang"): angle = profile.getSettingValue("support_angle") if angle != None: self._enabled_shader.setUniformValue("u_overhangAngle", math.cos(math.radians(90 - angle))) + else: + self._enabled_shader.setUniformValue("u_overhangAngle", math.cos(math.radians(0))) #Overhang angle of 0 causes no area at all to be marked as overhang. else: self._enabled_shader.setUniformValue("u_overhangAngle", math.cos(math.radians(0))) From 42e6d88e7f50623bfebe363f90380c9f7244c534 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 12 Feb 2016 13:39:19 +0100 Subject: [PATCH 2/9] JSON: default cone angle inversed to get less support by default (CURA-869) --- resources/machines/fdmprinter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 33259f5c54..4ab46a1d02 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -1303,7 +1303,7 @@ "type": "float", "min_value": "-90", "max_value": "90", - "default": 30, + "default": -30, "visible": false, "enabled": "support_conical_enabled and support_enable" }, From 14b6ae2a4cc489a96ac39ef0c033f21106f60d0e Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 12 Feb 2016 13:52:41 +0100 Subject: [PATCH 3/9] JSON: made support_minimal_diameter child of support_tower_diameter (CURA-870) --- resources/machines/fdmprinter.json | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 4ab46a1d02..c216192df5 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -1428,17 +1428,6 @@ "visible": false, "enabled": "support_enable" }, - "support_minimal_diameter": { - "label": "Minimum Diameter", - "description": "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower.", - "unit": "mm", - "type": "float", - "default": 1, - "min_value": "0", - "max_value_warning": "10", - "visible": false, - "enabled": "support_enable" - }, "support_tower_diameter": { "label": "Tower Diameter", "description": "The diameter of a special tower.", @@ -1446,10 +1435,24 @@ "type": "float", "default": 1, "min_value": "0", - "min_value_warning": "support_minimal_diameter", "max_value_warning": "10", "visible": false, - "enabled": "support_enable" + "enabled": "support_enable", + "children": { + "support_minimal_diameter": { + "label": "Minimum Diameter", + "description": "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower.", + "unit": "mm", + "type": "float", + "default": 1, + "min_value": "0", + "max_value_warning": "10", + "max_value": "support_tower_diameter", + "inherit": true, + "visible": false, + "enabled": "support_enable" + } + } }, "support_tower_roof_angle": { "label": "Tower Roof Angle", From 18ef6f9a6967e6f3abe7123f19aa430673bdb812 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 12 Feb 2016 13:58:23 +0100 Subject: [PATCH 4/9] JSON: default tower diam and support minimal diam changed to 3mm (CURA-870) --- resources/machines/fdmprinter.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index c216192df5..e517161c03 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -1433,7 +1433,7 @@ "description": "The diameter of a special tower.", "unit": "mm", "type": "float", - "default": 1, + "default": 3.0, "min_value": "0", "max_value_warning": "10", "visible": false, @@ -1444,7 +1444,7 @@ "description": "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower.", "unit": "mm", "type": "float", - "default": 1, + "default": 3.0, "min_value": "0", "max_value_warning": "10", "max_value": "support_tower_diameter", From 1271a7407e91613cf25d46cc914c2fd00d5a33a5 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 12 Feb 2016 15:26:56 +0100 Subject: [PATCH 5/9] JSON: support tower settings disabled if use_tower=Flase (CURA-870) --- resources/machines/fdmprinter.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index e517161c03..aa36079df1 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -1437,7 +1437,7 @@ "min_value": "0", "max_value_warning": "10", "visible": false, - "enabled": "support_enable", + "enabled": "support_enable and support_use_towers", "children": { "support_minimal_diameter": { "label": "Minimum Diameter", @@ -1450,7 +1450,7 @@ "max_value": "support_tower_diameter", "inherit": true, "visible": false, - "enabled": "support_enable" + "enabled": "support_enable and support_use_towers" } } }, From 9545f7da365d578040312d2826bfeabebe3ff72d Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 12 Feb 2016 15:44:04 +0100 Subject: [PATCH 6/9] JSON: fix: retraction settings not visible for UM2 anymore (CURA-875) --- resources/machines/ultimaker2.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/machines/ultimaker2.json b/resources/machines/ultimaker2.json index d90ebe31b7..ee97aa4ef6 100644 --- a/resources/machines/ultimaker2.json +++ b/resources/machines/ultimaker2.json @@ -87,6 +87,10 @@ "material_print_temperature": { "enabled": "False" }, "material_bed_temperature": { "enabled": "False" }, "material_diameter": { "enabled": "False" }, - "material_flow": { "enabled": "False" } + "material_flow": { "enabled": "False" }, + "retraction_amount": { "enabled": "False" }, + "retraction_speed": { "enabled": "False" }, + "retraction_retract_speed": { "enabled": "False" }, + "retraction_prime_speed": { "enabled": "False" } } } From 5614302f74cebd83955ad5e2e3ed34f3fd48c640 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 12 Feb 2016 15:54:06 +0100 Subject: [PATCH 7/9] JSON: made layer height max value warning depend on nozzle size (CURA-876) --- resources/machines/fdmprinter.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index aa36079df1..8d8198bbc4 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -210,7 +210,7 @@ "default": 0.1, "min_value": "0.001", "min_value_warning": "0.04", - "max_value_warning": "0.32", + "max_value_warning": "0.8 * machine_nozzle_size", "global_only": "print_sequence != \"one_at_a_time\"" }, "layer_height_0": { @@ -221,7 +221,7 @@ "default": 0.3, "min_value": "0.001", "min_value_warning": "0.04", - "max_value_warning": "0.32", + "max_value_warning": "0.8 * machine_nozzle_size", "visible": false, "global_only": "print_sequence != \"one_at_a_time\"" }, From 58238a593366da12318f0e54ff02a8fa01468e16 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 12 Feb 2016 15:56:03 +0100 Subject: [PATCH 8/9] JSON: made line_width max value warning depend on nozzle size (CURA-876) --- resources/machines/fdmprinter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 8d8198bbc4..ce88820075 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -231,7 +231,7 @@ "unit": "mm", "min_value": "0.0001", "min_value_warning": "0.2", - "max_value_warning": "5", + "max_value_warning": "2 * machine_nozzle_size", "default": 0.4, "type": "float", "visible": false, From ed5e59df57e55764e1ac527cc2f41786ea8e8cb3 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 12 Feb 2016 16:04:17 +0100 Subject: [PATCH 9/9] JSON: made some settings not visible by default (CURA-877) --- resources/machines/fdmprinter.json | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index ce88820075..cb8c8466a8 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -630,7 +630,7 @@ "description": "Change the temperature for each layer automatically with the average flow speed of that layer.", "type": "boolean", "default": false, - "visible": true + "visible": false }, "material_print_temperature": { "label": "Printing Temperature", @@ -658,7 +658,8 @@ "default": 150, "min_value": "0", "max_value_warning": "260", - "global_only": "print_sequence != \"one_at_a_time\"" + "global_only": "print_sequence != \"one_at_a_time\"", + "visible": false }, "material_extrusion_cool_down_speed": { "label": "Extrusion Cool Down Speed Modifier", @@ -668,7 +669,8 @@ "default": 0.5, "min_value": "0", "max_value_warning": "10.0", - "global_only": "print_sequence != \"one_at_a_time\"" + "global_only": "print_sequence != \"one_at_a_time\"", + "visible": false }, "material_bed_temperature": { "label": "Bed Temperature", @@ -1011,7 +1013,7 @@ "description": "Coasting replaces the last part of an extrusion path with a travel path. The oozed material is used to lay down the last piece of the extrusion path in order to reduce stringing.", "type": "boolean", "default": false, - "visible": true + "visible": false }, "coasting_volume": { "label": "Coasting Volume", @@ -1539,7 +1541,8 @@ "min_value": "0", "max_value_warning": "10", "enabled": "adhesion_type == \"skirt\"", - "global_only": "print_sequence != \"one_at_a_time\"" + "global_only": "print_sequence != \"one_at_a_time\"", + "visible": false }, "skirt_gap": { "label": "Skirt Distance", @@ -1550,7 +1553,8 @@ "min_value_warning": "0", "max_value_warning": "100", "enabled": "adhesion_type == \"skirt\"", - "global_only": "print_sequence != \"one_at_a_time\"" + "global_only": "print_sequence != \"one_at_a_time\"", + "visible": false }, "skirt_minimal_length": { "label": "Skirt Minimum Length", @@ -1562,7 +1566,8 @@ "min_value_warning": "25", "max_value_warning": "2500", "enabled": "adhesion_type == \"skirt\"", - "global_only": "print_sequence != \"one_at_a_time\"" + "global_only": "print_sequence != \"one_at_a_time\"", + "visible": false }, "brim_width": { "label": "Brim Width",