From e355c8f6e83dc6e3d8f32edd45b72527a6452062 Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Mon, 25 Sep 2023 11:44:03 +0200 Subject: [PATCH 1/9] Fixing the help message CURA-10228 --- 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 590b8d3f29..b284f4b4dd 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -2453,7 +2453,7 @@ "material_print_temperature_layer_0": { "label": "Printing Temperature Initial Layer", - "description": "The temperature used for printing the first layer. Set at 0 to disable special handling of the initial layer.", + "description": "The temperature used for printing the first layer.", "unit": "\u00b0C", "type": "float", "default_value": 215, From 19c6c68b0aa625ed7cb42fdcedd3983e36a40a9e Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Mon, 25 Sep 2023 13:36:36 +0200 Subject: [PATCH 2/9] Fix cura recommended mode crashing CURA-11051 --- .../PrintSetupSelector/Recommended/RecommendedPrintSetup.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml index 0f4efc8498..b89a251766 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml @@ -39,7 +39,7 @@ Flickable padding: UM.Theme.getSize("default_margin").width spacing: UM.Theme.getSize("default_margin").height - width: recommendedPrintSetup.width - 2 * padding - (scroll.visible ? scroll.width : 0) + width: recommendedPrintSetup.width - 2 * padding - UM.Theme.getSize("thin_margin").width // TODO property real firstColumnWidth: Math.round(width / 3) From 43694fde1cbac884973c88f961d943ed9b87b253 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Mon, 25 Sep 2023 15:03:11 +0200 Subject: [PATCH 3/9] Add setting to group outer walls CURA-11082 --- resources/definitions/fdmprinter.def.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index b284f4b4dd..79523957f5 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1162,6 +1162,13 @@ "default_value": false, "settable_per_mesh": true }, + "group_outer_walls": { + "label": "Group Outer Walls", + "description": "When enabled outer walls of the same island are printed in-sequence. When enabled the this limits the amount of flow changes, while disabling reduces the amount of travels", + "type": "bool", + "default_value": false, + "settable_per_mesh": true + }, "inset_direction": { "label": "Wall Ordering", From f448f3600d2b6b38d42b3b1c6bb0a36476dd4413 Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Mon, 25 Sep 2023 13:04:57 +0000 Subject: [PATCH 4/9] Applied printer-linter format --- 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 79523957f5..4f689f9ba7 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1162,7 +1162,8 @@ "default_value": false, "settable_per_mesh": true }, - "group_outer_walls": { + "group_outer_walls": + { "label": "Group Outer Walls", "description": "When enabled outer walls of the same island are printed in-sequence. When enabled the this limits the amount of flow changes, while disabling reduces the amount of travels", "type": "bool", From 288c1f7275ebefd46e7bfd281a85dff5071944c8 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Mon, 25 Sep 2023 15:07:07 +0200 Subject: [PATCH 5/9] Add new setting to visibility CURA-11082 --- resources/setting_visibility/advanced.cfg | 1 + resources/setting_visibility/expert.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/resources/setting_visibility/advanced.cfg b/resources/setting_visibility/advanced.cfg index c3451d2c98..0b021acd4c 100644 --- a/resources/setting_visibility/advanced.cfg +++ b/resources/setting_visibility/advanced.cfg @@ -23,6 +23,7 @@ wall_x_extruder_nr wall_thickness wall_line_count optimize_wall_printing_order +group_outer_walls xy_offset [top_bottom] diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg index 5388681e8f..abb4b81dba 100644 --- a/resources/setting_visibility/expert.cfg +++ b/resources/setting_visibility/expert.cfg @@ -32,6 +32,7 @@ wall_0_wipe_dist wall_0_inset wall_transition_filter_distance optimize_wall_printing_order +group_outer_walls inset_direction alternate_extra_perimeter fill_outline_gaps From 8d36f0a9fed87c2fb84e386aa7a48b2a324084fd Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Tue, 26 Sep 2023 10:43:30 +0200 Subject: [PATCH 6/9] Put group outer walls in experimental CURA-11082 --- resources/definitions/fdmprinter.def.json | 15 +++++++-------- resources/setting_visibility/advanced.cfg | 1 - 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 4f689f9ba7..911768bf7a 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1162,14 +1162,6 @@ "default_value": false, "settable_per_mesh": true }, - "group_outer_walls": - { - "label": "Group Outer Walls", - "description": "When enabled outer walls of the same island are printed in-sequence. When enabled the this limits the amount of flow changes, while disabling reduces the amount of travels", - "type": "bool", - "default_value": false, - "settable_per_mesh": true - }, "inset_direction": { "label": "Wall Ordering", @@ -8133,6 +8125,13 @@ "resolve": "max(extruderValues('raft_base_wall_count'))", "settable_per_mesh": false, "settable_per_extruder": false + }, + "group_outer_walls": { + "label": "Group Outer Walls", + "description": "When enabled outer walls of different islands are printed in-sequence. When enabled the this limits the amount of flow changes, while disabling reduces the amount of travels", + "type": "bool", + "default_value": true, + "settable_per_mesh": true } } }, diff --git a/resources/setting_visibility/advanced.cfg b/resources/setting_visibility/advanced.cfg index 0b021acd4c..c3451d2c98 100644 --- a/resources/setting_visibility/advanced.cfg +++ b/resources/setting_visibility/advanced.cfg @@ -23,7 +23,6 @@ wall_x_extruder_nr wall_thickness wall_line_count optimize_wall_printing_order -group_outer_walls xy_offset [top_bottom] From 0960668b76d691e178030a76d5f7e2d149fe45be Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Tue, 26 Sep 2023 08:45:03 +0000 Subject: [PATCH 7/9] Applied printer-linter format --- 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 911768bf7a..a7ab476010 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -8126,7 +8126,8 @@ "settable_per_mesh": false, "settable_per_extruder": false }, - "group_outer_walls": { + "group_outer_walls": + { "label": "Group Outer Walls", "description": "When enabled outer walls of different islands are printed in-sequence. When enabled the this limits the amount of flow changes, while disabling reduces the amount of travels", "type": "bool", From 07dc257d32398f88d46618ec455921b932fb8dd0 Mon Sep 17 00:00:00 2001 From: Mariska <40423138+MariMakes@users.noreply.github.com> Date: Tue, 26 Sep 2023 12:04:31 +0200 Subject: [PATCH 8/9] Update resources/definitions/fdmprinter.def.json CURA-11082 - Updated description --- 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 a7ab476010..d0d02363de 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -8129,7 +8129,7 @@ "group_outer_walls": { "label": "Group Outer Walls", - "description": "When enabled outer walls of different islands are printed in-sequence. When enabled the this limits the amount of flow changes, while disabling reduces the amount of travels", + "description": "Outer walls of different islands in the same layer are printed in sequence. When enabled the amount of flow changes is limited because walls are printed one type at a time, when disabled the number of travels between islands is reduced because walls in the same islands are grouped.", "type": "bool", "default_value": true, "settable_per_mesh": true From 3ebeb0a6616ee37cedb513f78a35ca4820e9a349 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 26 Sep 2023 13:59:45 +0200 Subject: [PATCH 9/9] Set a brand to empty material to avoid later crash CURA-11089 --- cura/Settings/cura_empty_instance_containers.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cura/Settings/cura_empty_instance_containers.py b/cura/Settings/cura_empty_instance_containers.py index b142c53c11..f868c3709f 100644 --- a/cura/Settings/cura_empty_instance_containers.py +++ b/cura/Settings/cura_empty_instance_containers.py @@ -28,6 +28,7 @@ empty_material_container.setMetaDataEntry("type", "material") empty_material_container.setMetaDataEntry("base_file", "empty_material") empty_material_container.setMetaDataEntry("GUID", "FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFF") empty_material_container.setMetaDataEntry("material", "empty") +empty_material_container.setMetaDataEntry("brand", "empty_brand") # Empty quality EMPTY_QUALITY_CONTAINER_ID = "empty_quality"