From 66b26bafd4dd8d9d5588649ca002de73bf635852 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 9 Aug 2017 13:26:58 +0200 Subject: [PATCH 1/3] Show quality name in project loading summary CURA-4142 In case the quality changes container is not there, show the quality name of the quality profile. --- plugins/3MFReader/ThreeMFWorkspaceReader.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index 9b390cb636..fe035e61a3 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -226,6 +226,9 @@ class ThreeMFWorkspaceReader(WorkspaceReader): if definition_changes: if definition_changes[0] != instance_container: definition_changes_conflict = True + elif container_type == "quality": + if not quality_name: + quality_name = instance_container.getName() elif container_type == "user": num_user_settings += len(instance_container._instances) elif container_type in self._ignored_instance_container_types: From 1aba451149963ecd902fd2bbced9a640eeb8c5ed Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 9 Aug 2017 13:52:03 +0200 Subject: [PATCH 2/3] Fix value for outer wall_line_width CURA-4145 --- 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 cf1cc948e2..40f8d0fd21 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -678,7 +678,7 @@ "minimum_value_warning": "(0.1 + 0.4 * machine_nozzle_size) if outer_inset_first else 0.1 * machine_nozzle_size", "maximum_value_warning": "2 * machine_nozzle_size", "default_value": 0.4, - "value": "extruderValue(wall_0_extruder_nr, 'wall_line_width')", + "value": "wall_line_width", "type": "float", "limit_to_extruder": "wall_0_extruder_nr", "settable_per_mesh": true From a49c956cfad033dc0cbb45e8f65ad93638495111 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 9 Aug 2017 16:57:19 +0200 Subject: [PATCH 3/3] Temporary work around for "not overriden" limit to extruder features CURA-4145 When features with limit to extruder set to "not overriden" and its value is retrieved with "extruderValue()", because the extruder number is "-1", extruderValue() falls back to the global stack. As a result, values can be incorrect. This workaround using the variants temporarily solves the problem for outer and inner wall line widths. --- resources/variants/ultimaker3_aa0.8.inst.cfg | 1 + resources/variants/ultimaker3_bb0.8.inst.cfg | 1 + resources/variants/ultimaker3_extended_aa0.8.inst.cfg | 1 + resources/variants/ultimaker3_extended_bb0.8.inst.cfg | 1 + 4 files changed, 4 insertions(+) diff --git a/resources/variants/ultimaker3_aa0.8.inst.cfg b/resources/variants/ultimaker3_aa0.8.inst.cfg index 9d31e166ed..1e8366c765 100644 --- a/resources/variants/ultimaker3_aa0.8.inst.cfg +++ b/resources/variants/ultimaker3_aa0.8.inst.cfg @@ -62,5 +62,6 @@ switch_extruder_prime_speed = 20 switch_extruder_retraction_amount = 16.5 top_bottom_thickness = 1.4 wall_0_inset = 0 +wall_line_width_0 = =wall_line_width wall_line_width_x = =wall_line_width wall_thickness = 2 diff --git a/resources/variants/ultimaker3_bb0.8.inst.cfg b/resources/variants/ultimaker3_bb0.8.inst.cfg index 3a984318c7..ddb1aa3c7e 100644 --- a/resources/variants/ultimaker3_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_bb0.8.inst.cfg @@ -86,5 +86,6 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 12 top_bottom_thickness = 1 wall_0_inset = 0 +wall_line_width_0 = =wall_line_width wall_line_width_x = =wall_line_width wall_thickness = 1 diff --git a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg index 8f97e448b0..59b057186e 100644 --- a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg +++ b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg @@ -62,5 +62,6 @@ switch_extruder_prime_speed = 20 switch_extruder_retraction_amount = 16.5 top_bottom_thickness = 1.4 wall_0_inset = 0 +wall_line_width_0 = =wall_line_width wall_line_width_x = =wall_line_width wall_thickness = 2 diff --git a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg index 5bb17451c6..55ed280f36 100644 --- a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg @@ -86,5 +86,6 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 12 top_bottom_thickness = 1 wall_0_inset = 0 +wall_line_width_0 = =wall_line_width wall_line_width_x = =wall_line_width wall_thickness = 1