From 0ab41d8ac20f0b7640b06f1885b3be7d8d59b82f Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 27 Jul 2017 09:50:14 +0200 Subject: [PATCH 1/7] Fix comment location CURA-4048 --- plugins/CuraEngineBackend/CuraEngineBackend.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index 935ec94054..d87c97e3ff 100755 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -611,8 +611,8 @@ class CuraEngineBackend(QObject, Backend): if self._process: Logger.log("d", "Backend quit with return code %s. Resetting process and socket.", self._process.wait()) self._process = None - ## Called when the global container stack changes + ## Called when the global container stack changes def _onGlobalStackChanged(self): if self._global_container_stack: self._global_container_stack.propertyChanged.disconnect(self._onSettingChanged) From 26ec06e1fe5d13f50041f6657d3a6ae5c3b2a365 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 31 Jul 2017 13:40:20 +0200 Subject: [PATCH 2/7] Update setting labels and descriptions CURA-3957 --- resources/definitions/fdmprinter.def.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 7f57875650..5528c59560 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3404,8 +3404,8 @@ }, "support_skip_some_zags": { - "label": "Skip Some ZigZags Connections", - "description": "Skip some ZigZags connections to make the support structure easier to break.", + "label": "Skip Some Support Line Connections", + "description": "Skip some support line connections to make the support structure easier to break away.", "type": "bool", "default_value": false, "enabled": "support_enable and (support_pattern == 'zigzag')", @@ -3415,8 +3415,8 @@ }, "support_zag_skip_count": { - "label": "ZigZag Connection Skip Count", - "description": "Skip one in every N connection lines to make the support structure easier to break.", + "label": "Support Line Connection Skip Chunk Size", + "description": "Skip one in every N connection lines to make the support structure easier to break away.", "type": "int", "default_value": 6, "minimum_value": "1", From 02ba46b29f9ce5ec08099c584cf92474d1aa6c6a Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 1 Aug 2017 08:23:27 +0200 Subject: [PATCH 3/7] Add support_skip_zag_per_mm CURA-3957 --- resources/definitions/fdmprinter.def.json | 35 +++++++++++++++++------ 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 5528c59560..ed79728122 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3405,7 +3405,7 @@ "support_skip_some_zags": { "label": "Skip Some Support Line Connections", - "description": "Skip some support line connections to make the support structure easier to break away.", + "description": "Skip some support line connections to make the support structure easier to break away. This setting is applicable to the Zig Zag support infill pattern.", "type": "bool", "default_value": false, "enabled": "support_enable and (support_pattern == 'zigzag')", @@ -3413,18 +3413,35 @@ "settable_per_mesh": false, "settable_per_extruder": true }, - "support_zag_skip_count": + "support_skip_zag_per_mm": { - "label": "Support Line Connection Skip Chunk Size", - "description": "Skip one in every N connection lines to make the support structure easier to break away.", - "type": "int", - "default_value": 6, - "minimum_value": "1", - "minimum_value_warning": "3", + "label": "Support Line Skip Frequency", + "description": "To skip one connection line in every N mm to make the support structure easier to break away.", + "type": "float", + "value": "support_line_distance * 5", + "minimum_value": "0", + "minimum_value_warning": "support_line_distance", "enabled": "support_enable and (support_pattern == 'zigzag') and support_skip_some_zags", "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": false, - "settable_per_extruder": true + "settable_per_extruder": true, + "children": + { + "support_zag_skip_count": + { + "label": "Support Chunk Size", + "description": "Skip one in every N connection lines to make the support structure easier to break away.", + "type": "int", + "default_value": 5, + "value": "round(support_skip_zag_per_mm / support_line_distance)", + "minimum_value": "1", + "minimum_value_warning": "3", + "enabled": "support_enable and (support_pattern == 'zigzag') and support_skip_some_zags", + "limit_to_extruder": "support_infill_extruder_nr", + "settable_per_mesh": false, + "settable_per_extruder": true + } + } }, "support_infill_rate": { From 8029efdffbfa610d213a236d662d0ca6ba52db44 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 3 Aug 2017 13:55:22 +0200 Subject: [PATCH 4/7] Rename skip-some-zags setting names CURA-3957 --- resources/definitions/fdmprinter.def.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 5c7ffc1110..a52ceecc2b 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3381,7 +3381,7 @@ }, "support_skip_some_zags": { - "label": "Skip Some Support Line Connections", + "label": "Break Up Support In Chunks", "description": "Skip some support line connections to make the support structure easier to break away. This setting is applicable to the Zig Zag support infill pattern.", "type": "bool", "default_value": false, @@ -3392,7 +3392,7 @@ }, "support_skip_zag_per_mm": { - "label": "Support Line Skip Frequency", + "label": "Support Chunk Size", "description": "To skip one connection line in every N mm to make the support structure easier to break away.", "type": "float", "value": "support_line_distance * 5", @@ -3406,7 +3406,7 @@ { "support_zag_skip_count": { - "label": "Support Chunk Size", + "label": "Support Chunk Line Count", "description": "Skip one in every N connection lines to make the support structure easier to break away.", "type": "int", "default_value": 5, From f5c1bd6abdb457a231f59dbf21060774e67e5bb2 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 3 Aug 2017 13:55:50 +0200 Subject: [PATCH 5/7] Add unit "mm" for Support Chunk Size CURA-3957 --- resources/definitions/fdmprinter.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index a52ceecc2b..7c78f1a3ae 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3395,6 +3395,7 @@ "label": "Support Chunk Size", "description": "To skip one connection line in every N mm to make the support structure easier to break away.", "type": "float", + "unit": "mm", "value": "support_line_distance * 5", "minimum_value": "0", "minimum_value_warning": "support_line_distance", From c2ac7313243cb5afe0adfeeeb2a06e9a686d65f4 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 14 Aug 2017 15:49:16 +0200 Subject: [PATCH 6/7] update support_skip_zag_per_mm description and default value (CURA-3957) --- resources/definitions/fdmprinter.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 7c78f1a3ae..4d0ded8033 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3393,10 +3393,10 @@ "support_skip_zag_per_mm": { "label": "Support Chunk Size", - "description": "To skip one connection line in every N mm to make the support structure easier to break away.", + "description": "Leave out a connection between support lines once every N millimeter to make the support structure easier to break away.", "type": "float", "unit": "mm", - "value": "support_line_distance * 5", + "value": "15", "minimum_value": "0", "minimum_value_warning": "support_line_distance", "enabled": "support_enable and (support_pattern == 'zigzag') and support_skip_some_zags", From 317de1c75d80e6e9c90fe0601044626e48ae06d6 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 14 Aug 2017 15:57:39 +0200 Subject: [PATCH 7/7] update support_skip_zag_per_mm default value (CURA-3957) --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 4d0ded8033..5deb4f5ee5 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3396,7 +3396,7 @@ "description": "Leave out a connection between support lines once every N millimeter to make the support structure easier to break away.", "type": "float", "unit": "mm", - "value": "15", + "default_value": 20, "minimum_value": "0", "minimum_value_warning": "support_line_distance", "enabled": "support_enable and (support_pattern == 'zigzag') and support_skip_some_zags",