From 337cd127dccac02bed809b1549d069f29dda3b8f Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 14 Nov 2016 12:02:23 +0100 Subject: [PATCH 1/5] JSOn feat: adhesion_type none (CURA-759) --- resources/definitions/fdmprinter.def.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index ce6a341467..7c5200ba1f 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -2985,7 +2985,8 @@ { "skirt": "Skirt", "brim": "Brim", - "raft": "Raft" + "raft": "Raft", + "none": "None" }, "default_value": "brim", "resolve": "'raft' if 'raft' in extruderValues('adhesion_type') else ('brim' if 'brim' in extruderValues('adhesion_type') else 'skirt')", From 995705f82b610a683bc58c1daf22bc78124dfca9 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 14 Nov 2016 12:36:21 +0100 Subject: [PATCH 2/5] fix: don't expand disallowed areas when using none platform adhesion (CURA-759) --- cura/BuildVolume.py | 2 ++ cura/ConvexHullDecorator.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index 327f79f67b..51b7e07794 100644 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -653,6 +653,8 @@ class BuildVolume(SceneNode): bed_adhesion_size += value elif adhesion_type == "raft": bed_adhesion_size = self._getSettingFromAdhesionExtruder("raft_margin") + elif adhesion_type == "none": + bed_adhesion_size = 0 else: raise Exception("Unknown bed adhesion type. Did you forget to update the build volume calculations for your new bed adhesion type?") diff --git a/cura/ConvexHullDecorator.py b/cura/ConvexHullDecorator.py index a7d0775e21..c4b2fe0337 100644 --- a/cura/ConvexHullDecorator.py +++ b/cura/ConvexHullDecorator.py @@ -236,6 +236,8 @@ class ConvexHullDecorator(SceneNodeDecorator): extra_margin = max(0, self._getSettingProperty("raft_margin", "value")) elif adhesion_type == "brim": extra_margin = max(0, self._getSettingProperty("brim_line_count", "value") * self._getSettingProperty("skirt_brim_line_width", "value")) + elif adhesion_type == "none": + extra_margin = 0 elif adhesion_type == "skirt": extra_margin = max( 0, self._getSettingProperty("skirt_gap", "value") + From 0c550859ddea84c172a8cc3a75adff47f803b7fb Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 14 Nov 2016 12:39:41 +0100 Subject: [PATCH 3/5] fix: don't register adhesion_extruder_nr as used if adhesion_type == none (CURA-759) Also the old line obtained brim_line_count from the global stack, while it is settable_per_extruder! Also we now assume selecting a brim means you want to print it. I don't think having a brim line count of zero meant that you wouldnt get a brim; the minimal brim length also plays a role... --- cura/Settings/ExtruderManager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Settings/ExtruderManager.py b/cura/Settings/ExtruderManager.py index 5517830141..a3eef51009 100644 --- a/cura/Settings/ExtruderManager.py +++ b/cura/Settings/ExtruderManager.py @@ -336,8 +336,8 @@ class ExtruderManager(QObject): if support_interface_enabled: used_extruder_stack_ids.add(self.extruderIds[str(global_stack.getProperty("support_interface_extruder_nr", "value"))]) - #The platform adhesion extruder. Not used if using brim and brim width is 0. - if global_stack.getProperty("adhesion_type", "value") != "brim" or global_stack.getProperty("brim_line_count", "value") > 0: + #The platform adhesion extruder. Not used if using none. + if global_stack.getProperty("adhesion_type", "value") != "none": used_extruder_stack_ids.add(self.extruderIds[str(global_stack.getProperty("adhesion_extruder_nr", "value"))]) return [container_registry.findContainerStacks(id = stack_id)[0] for stack_id in used_extruder_stack_ids] From 16828d98d482bb92c7b37857da2d36073e1304e5 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 14 Nov 2016 12:50:01 +0100 Subject: [PATCH 4/5] JSON spelling fix: draft ==> draught (CURA-759) --- resources/definitions/fdmprinter.def.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 7c5200ba1f..c4be63f917 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3821,7 +3821,7 @@ { "draft_shield_enabled": { - "label": "Enable Draft Shield", + "label": "Enable Draught Shield", "description": "This will create a wall around the model, which traps (hot) air and shields against exterior airflow. Especially useful for materials which warp easily.", "type": "bool", "default_value": false, @@ -3830,8 +3830,8 @@ }, "draft_shield_dist": { - "label": "Draft Shield X/Y Distance", - "description": "Distance of the draft shield from the print, in the X/Y directions.", + "label": "Draught Shield X/Y Distance", + "description": "Distance of the draught shield from the print, in the X/Y directions.", "unit": "mm", "type": "float", "minimum_value": "0", @@ -3844,8 +3844,8 @@ }, "draft_shield_height_limitation": { - "label": "Draft Shield Limitation", - "description": "Set the height of the draft shield. Choose to print the draft shield at the full height of the model or at a limited height.", + "label": "Draught Shield Limitation", + "description": "Set the height of the draught shield. Choose to print the draught shield at the full height of the model or at a limited height.", "type": "enum", "options": { @@ -3860,8 +3860,8 @@ }, "draft_shield_height": { - "label": "Draft Shield Height", - "description": "Height limitation of the draft shield. Above this height no draft shield will be printed.", + "label": "Draught Shield Height", + "description": "Height limitation of the draught shield. Above this height no draught shield will be printed.", "unit": "mm", "type": "float", "minimum_value": "0", From ff141747243d5f1e67e1370876c11f376dd3f794 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 16 Nov 2016 17:15:37 +0100 Subject: [PATCH 5/5] Revert "JSON spelling fix: draft ==> draught (CURA-759)" This reverts commit 16828d98d482bb92c7b37857da2d36073e1304e5. --- resources/definitions/fdmprinter.def.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index c4be63f917..7c5200ba1f 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3821,7 +3821,7 @@ { "draft_shield_enabled": { - "label": "Enable Draught Shield", + "label": "Enable Draft Shield", "description": "This will create a wall around the model, which traps (hot) air and shields against exterior airflow. Especially useful for materials which warp easily.", "type": "bool", "default_value": false, @@ -3830,8 +3830,8 @@ }, "draft_shield_dist": { - "label": "Draught Shield X/Y Distance", - "description": "Distance of the draught shield from the print, in the X/Y directions.", + "label": "Draft Shield X/Y Distance", + "description": "Distance of the draft shield from the print, in the X/Y directions.", "unit": "mm", "type": "float", "minimum_value": "0", @@ -3844,8 +3844,8 @@ }, "draft_shield_height_limitation": { - "label": "Draught Shield Limitation", - "description": "Set the height of the draught shield. Choose to print the draught shield at the full height of the model or at a limited height.", + "label": "Draft Shield Limitation", + "description": "Set the height of the draft shield. Choose to print the draft shield at the full height of the model or at a limited height.", "type": "enum", "options": { @@ -3860,8 +3860,8 @@ }, "draft_shield_height": { - "label": "Draught Shield Height", - "description": "Height limitation of the draught shield. Above this height no draught shield will be printed.", + "label": "Draft Shield Height", + "description": "Height limitation of the draft shield. Above this height no draft shield will be printed.", "unit": "mm", "type": "float", "minimum_value": "0",