From f27685e6ac4ca5c4536bae656e8cb98e51cff1cc Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Tue, 20 Feb 2018 13:56:30 +0100 Subject: [PATCH 1/8] CURA-4017 Enable the setting zig_zagiffy_infill for the grid and triangular patterns --- 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 80bb9b19b9..b1f79dcbb6 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1528,7 +1528,7 @@ "description": "Connect the ends where the infill pattern meets the inner wall using a line which follows the shape of the inner wall. Enabling this setting can make the infill adhere to the walls better and reduce the effects of infill on the quality of vertical surfaces. Disabling this setting reduces the amount of material used.", "type": "bool", "default_value": true, - "enabled": "infill_pattern == 'cross' or infill_pattern == 'cross_3d'", + "enabled": "infill_pattern == 'cross' or infill_pattern == 'cross_3d' or infill_pattern == 'grid' or infill_pattern == 'triangles'", "settable_per_mesh": true }, "infill_angles": From 767539b80b22207c4a9356b7bc430575a2c450f8 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Tue, 20 Feb 2018 10:46:01 +0100 Subject: [PATCH 2/8] CURA-4790 Changed light weights back to normal --- resources/themes/cura-light/theme.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 8eb874334a..1b5ddfe141 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -12,12 +12,12 @@ }, "large_nonbold": { "size": 1.35, - "weight": 25, + "weight": 50, "family": "Noto Sans" }, "default": { "size": 1.0, - "weight": 25, + "weight": 50, "family": "Noto Sans" }, "default_bold": { @@ -28,7 +28,7 @@ }, "default_italic": { "size": 1.15, - "weight": 25, + "weight": 50, "italic": true, "family": "Noto Sans" }, @@ -40,12 +40,12 @@ }, "very_small": { "size": 1.0, - "weight": 25, + "weight": 50, "family": "Noto Sans" }, "button_tooltip": { "size": 1.0, - "weight": 25, + "weight": 50, "family": "Noto Sans" }, "setting_category": { @@ -56,7 +56,7 @@ }, "action_button": { "size": 1.15, - "weight": 25, + "weight": 50, "bold": true, "family": "Noto Sans" } From 03265cb90a5eec0a0fb0fd827371e9d5d2b1993e Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Tue, 20 Feb 2018 11:04:23 +0100 Subject: [PATCH 3/8] CURA-4790 Removed "bold" property --- resources/themes/cura-light/theme.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 1b5ddfe141..8c8e6d1c47 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -7,7 +7,6 @@ "large": { "size": 1.35, "weight": 63, - "bold": true, "family": "Noto Sans" }, "large_nonbold": { @@ -23,7 +22,6 @@ "default_bold": { "size": 1.0, "weight": 63, - "bold": true, "family": "Noto Sans" }, "default_italic": { @@ -35,7 +33,6 @@ "small": { "size": 1.0, "weight": 63, - "bold": true, "family": "Noto Sans" }, "very_small": { @@ -51,13 +48,11 @@ "setting_category": { "size": 1.15, "weight": 63, - "bold": true, "family": "Noto Sans" }, "action_button": { "size": 1.15, "weight": 50, - "bold": true, "family": "Noto Sans" } }, From 31ad0dd56c0f55b7d5555085e6890e9972369e1c Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 21 Feb 2018 08:43:39 +0100 Subject: [PATCH 4/8] Allow zig-zaggifying infill for patterns other than Cross as well It is now supported for any linear-based infill except zigzag (which has its own algorithm; that's a TODO). Contributes to issue CURA-4017. --- 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 b1f79dcbb6..6cfebf3dad 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1528,7 +1528,7 @@ "description": "Connect the ends where the infill pattern meets the inner wall using a line which follows the shape of the inner wall. Enabling this setting can make the infill adhere to the walls better and reduce the effects of infill on the quality of vertical surfaces. Disabling this setting reduces the amount of material used.", "type": "bool", "default_value": true, - "enabled": "infill_pattern == 'cross' or infill_pattern == 'cross_3d' or infill_pattern == 'grid' or infill_pattern == 'triangles'", + "enabled": "infill_pattern == 'grid' || infill_pattern == 'triangles' || infill_pattern == 'trihexagon' || infill_pattern == 'cubic' || infill_pattern == 'tetrahedral' || infill_pattern == 'quarter_cubic' || infill_pattern == 'cross' || infill_pattern == 'cross_3d'", "settable_per_mesh": true }, "infill_angles": From f3aeb01af0adfedca30941b1c4fb10306c5aa466 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 21 Feb 2018 08:45:08 +0100 Subject: [PATCH 5/8] Only enable Connect Infill Lines by default for Cross We don't want to change the default behaviour yet. Contributes to issue CURA-4017. --- 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 6cfebf3dad..b5b7cd1c5d 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1527,7 +1527,8 @@ "label": "Connect Infill Lines", "description": "Connect the ends where the infill pattern meets the inner wall using a line which follows the shape of the inner wall. Enabling this setting can make the infill adhere to the walls better and reduce the effects of infill on the quality of vertical surfaces. Disabling this setting reduces the amount of material used.", "type": "bool", - "default_value": true, + "default_value": false, + "value": "infill_pattern == 'cross' || infill_pattern == 'cross_3d'", "enabled": "infill_pattern == 'grid' || infill_pattern == 'triangles' || infill_pattern == 'trihexagon' || infill_pattern == 'cubic' || infill_pattern == 'tetrahedral' || infill_pattern == 'quarter_cubic' || infill_pattern == 'cross' || infill_pattern == 'cross_3d'", "settable_per_mesh": true }, From 6110b83844af70ffc6fc67c852ca952baa7b692f Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 21 Feb 2018 09:51:14 +0100 Subject: [PATCH 6/8] Use 'or' instead of '||' for Python code Oops. Contributes to issue CURA-4017. --- 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 b5b7cd1c5d..c8045ebce9 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1528,8 +1528,8 @@ "description": "Connect the ends where the infill pattern meets the inner wall using a line which follows the shape of the inner wall. Enabling this setting can make the infill adhere to the walls better and reduce the effects of infill on the quality of vertical surfaces. Disabling this setting reduces the amount of material used.", "type": "bool", "default_value": false, - "value": "infill_pattern == 'cross' || infill_pattern == 'cross_3d'", - "enabled": "infill_pattern == 'grid' || infill_pattern == 'triangles' || infill_pattern == 'trihexagon' || infill_pattern == 'cubic' || infill_pattern == 'tetrahedral' || infill_pattern == 'quarter_cubic' || infill_pattern == 'cross' || infill_pattern == 'cross_3d'", + "value": "infill_pattern == 'cross' or infill_pattern == 'cross_3d'", + "enabled": "infill_pattern == 'grid' or infill_pattern == 'triangles' or infill_pattern == 'trihexagon' or infill_pattern == 'cubic' or infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' or infill_pattern == 'cross' or infill_pattern == 'cross_3d'", "settable_per_mesh": true }, "infill_angles": From dba748bd8a4aced9428d870b0684b686c435bd86 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 22 Feb 2018 16:43:50 +0100 Subject: [PATCH 7/8] Add new setting for zig-zaggifying support You can now also use the zigzag type patterns for support. Contributes to issue CURA-4017. --- resources/definitions/fdmprinter.def.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index c8045ebce9..7eba95f2fc 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3572,6 +3572,18 @@ "settable_per_mesh": false, "settable_per_extruder": true }, + "zig_zaggify_support": + { + "label": "Connect Support Lines", + "description": "Connect the ends of the support lines together. Enabling this setting can make your support more sturdy and reduce underextrusion, but it will cost more material.", + "type": "bool", + "default_value": false, + "value": "support_pattern == 'cross'", + "enabled": "support_pattern == 'grid' or support_pattern == 'triangles' or support_pattern == 'cross'", + "limit_to_extruder": "support_infill_extruder_nr", + "settable_per_mesh": false, + "settable_per_extruder": true + }, "support_connect_zigzags": { "label": "Connect Support ZigZags", From fc9b2c35297fa8615bf338ebe16db9dea398d22a Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 22 Feb 2018 16:44:39 +0100 Subject: [PATCH 8/8] Limit infill zigzaggify setting to infill extruder Let's give it the same properties as the infill pattern setting. Contributes to issue CURA-4017. --- 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 7eba95f2fc..4b14500360 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1530,6 +1530,7 @@ "default_value": false, "value": "infill_pattern == 'cross' or infill_pattern == 'cross_3d'", "enabled": "infill_pattern == 'grid' or infill_pattern == 'triangles' or infill_pattern == 'trihexagon' or infill_pattern == 'cubic' or infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' or infill_pattern == 'cross' or infill_pattern == 'cross_3d'", + "limit_to_extruder": "infill_extruder_nr", "settable_per_mesh": true }, "infill_angles":