From 72d1f39112e4c80db3f04962fad1642ce216f218 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 31 May 2019 12:48:18 +0200 Subject: [PATCH 1/3] Document better what adhesion spacing is used Contributes to issue CURA-6551. --- cura/BuildVolume.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index 8caa45c5f6..b5013c7bc1 100755 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -1,6 +1,6 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from UM.Scene.Camera import Camera + from cura.Scene.CuraSceneNode import CuraSceneNode from cura.Settings.ExtruderManager import ExtruderManager from UM.Application import Application #To modify the maximum zoom level. @@ -1027,6 +1027,7 @@ class BuildVolume(SceneNode): adhesion_type = container_stack.getProperty("adhesion_type", "value") skirt_brim_line_width = self._global_container_stack.getProperty("skirt_brim_line_width", "value") initial_layer_line_width_factor = self._global_container_stack.getProperty("initial_layer_line_width_factor", "value") + #Use brim width if brim is enabled OR the prime tower has a brim. if adhesion_type == "brim" or (self._global_container_stack.getProperty("prime_tower_brim_enable", "value") and adhesion_type != "raft"): brim_line_count = self._global_container_stack.getProperty("brim_line_count", "value") @@ -1037,7 +1038,7 @@ class BuildVolume(SceneNode): # We don't create an additional line for the extruder we're printing the brim with. bed_adhesion_size -= skirt_brim_line_width * initial_layer_line_width_factor / 100.0 - elif adhesion_type == "skirt": + elif adhesion_type == "skirt": #No brim? Also not on prime tower? Then use whatever the adhesion type is saying: Skirt, raft or none. skirt_distance = self._global_container_stack.getProperty("skirt_gap", "value") skirt_line_count = self._global_container_stack.getProperty("skirt_line_count", "value") From ac9f892e098b51413ff8937ad0746a49edd0a99e Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 31 May 2019 12:53:08 +0200 Subject: [PATCH 2/3] Remove useless '== True' --- cura/BuildVolume.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index b5013c7bc1..038d0e9791 100755 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -736,7 +736,7 @@ class BuildVolume(SceneNode): # Add prime tower location as disallowed area. if len(used_extruders) > 1: #No prime tower in single-extrusion. - if len([x for x in used_extruders if x.isEnabled == True]) > 1: #No prime tower if only one extruder is enabled + if len([x for x in used_extruders if x.isEnabled]) > 1: #No prime tower if only one extruder is enabled prime_tower_collision = False prime_tower_areas = self._computeDisallowedAreasPrinted(used_extruders) for extruder_id in prime_tower_areas: From 95e7835da80d2f945ba258171eef953f8ad7ffec Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 31 May 2019 13:06:10 +0200 Subject: [PATCH 3/3] Better defaults for preshrink and skin expansion distance in CLI Discovered during investigation of Ultimaker/CuraEngine#1062. --- resources/definitions/fdmprinter.def.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index f0739afa9e..98ebb75c6f 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1925,7 +1925,7 @@ "description": "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model.", "unit": "mm", "type": "float", - "default_value": 0, + "default_value": 1, "value": "wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x", "minimum_value": "0", "enabled": "top_layers > 0 or bottom_layers > 0", @@ -1939,7 +1939,7 @@ "description": "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model.", "unit": "mm", "type": "float", - "default_value": 0, + "default_value": 1, "value": "skin_preshrink", "minimum_value": "0", "enabled": "top_layers > 0 or bottom_layers > 0", @@ -1952,7 +1952,7 @@ "description": "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model.", "unit": "mm", "type": "float", - "default_value": 0, + "default_value": 1, "value": "skin_preshrink", "minimum_value": "0", "enabled": "top_layers > 0 or bottom_layers > 0", @@ -1967,7 +1967,7 @@ "description": "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used.", "unit": "mm", "type": "float", - "default_value": 2.8, + "default_value": 1, "value": "wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x", "minimum_value": "-skin_preshrink", "limit_to_extruder": "top_bottom_extruder_nr", @@ -1981,7 +1981,7 @@ "description": "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used.", "unit": "mm", "type": "float", - "default_value": 2.8, + "default_value": 1, "value": "expand_skins_expand_distance", "minimum_value": "-top_skin_preshrink", "enabled": "top_layers > 0 or bottom_layers > 0", @@ -1994,7 +1994,7 @@ "description": "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used.", "unit": "mm", "type": "float", - "default_value": 2.8, + "default_value": 1, "value": "expand_skins_expand_distance", "minimum_value": "-bottom_skin_preshrink", "enabled": "top_layers > 0 or bottom_layers > 0",