Skip to content

Commit

Permalink
Merge branch '5.8'
Browse files Browse the repository at this point in the history
  • Loading branch information
rburema committed Jul 31, 2024
2 parents 8062d92 + 931aac2 commit dd9f196
Show file tree
Hide file tree
Showing 164 changed files with 92 additions and 190 deletions.
9 changes: 9 additions & 0 deletions cura/Settings/GlobalStack.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,15 @@ def supportsMaterialExport(self):
"""
return self.getMetaDataEntry("supports_material_export", False)

@pyqtProperty("QVariantList", constant = True)
def getOutputFileFormats(self) -> List[str]:
"""
Which output formats the printer supports.
:return: A list of strings with MIME-types.
"""
all_formats_str = self.getMetaDataEntry("file_formats", "")
return all_formats_str.split(";")

@classmethod
def getLoadingPriority(cls) -> int:
return 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ Item
anchors.rightMargin: UM.Theme.getSize("thin_margin").height

enabled: UM.Backend.state == UM.Backend.Done
currentIndex: UM.Backend.state == UM.Backend.Done ? dfFilenameTextfield.text.startsWith("MM")? 1 : 0 : 2
currentIndex: UM.Backend.state == UM.Backend.Done ? (Cura.MachineManager.activeMachine.getOutputFileFormats.includes("application/x-makerbot") ? 1 : 0) : 2

textRole: "text"
valueRole: "value"
Expand Down
7 changes: 3 additions & 4 deletions plugins/XmlMaterialProfile/XmlMaterialProfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -1083,10 +1083,9 @@ def _addSettingElement(self, builder, instance):
# Skip material properties (eg diameter) or metadata (eg GUID)
return

if instance.value is True:
data = "yes"
elif instance.value is False:
data = "no"
truth_map = { True: "yes", False: "no" }
if tag_name != "cura:setting" and instance.value in truth_map:
data = truth_map[instance.value]
else:
data = str(instance.value)

Expand Down
4 changes: 2 additions & 2 deletions resources/definitions/ultimaker.def.json
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@
"support_line_distance": { "minimum_value_warning": "0 if support_structure == 'tree' else support_line_width" },
"support_tower_maximum_supported_diameter": { "value": "support_tower_diameter" },
"support_tower_roof_angle": { "value": "0 if support_interface_enable else 65" },
"support_use_towers": { "value": false },
"support_wall_count": { "value": "1 if support_structure == 'tree' else 0" },
"support_xy_distance_overhang": { "value": "0.2" },
"support_z_distance": { "value": "0" },
Expand All @@ -139,7 +138,8 @@
"wall_x_material_flow_layer_0": { "value": "0.95 * material_flow_layer_0" },
"xy_offset": { "value": "-layer_height * 0.1" },
"xy_offset_layer_0": { "value": "-wall_line_width_0 / 5 + xy_offset" },
"z_seam_corner": { "value": "'z_seam_corner_none'" },
"z_seam_corner": { "value": "'z_seam_corner_weighted'" },
"z_seam_relative": { "value": "True" },
"zig_zaggify_support": { "value": true }
}
}
2 changes: 2 additions & 0 deletions resources/definitions/ultimaker_method_base.def.json
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,7 @@
"support_interface_enable": { "value": true },
"support_interface_height": { "value": "4*support_infill_sparse_thickness" },
"support_interface_material_flow": { "value": "material_flow" },
"support_interface_offset": { "value": "1" },
"support_interface_pattern": { "value": "'lines'" },
"support_interface_wall_count": { "value": "1" },
"support_material_flow": { "value": "material_flow" },
Expand All @@ -413,6 +414,7 @@
"support_roof_height": { "value": "4*layer_height" },
"support_roof_material_flow": { "value": "material_flow" },
"support_supported_skin_fan_speed": { "value": "cool_fan_speed_max" },
"support_use_towers": { "value": "False" },
"support_wall_count": { "value": "2 if support_conical_enabled or support_structure == 'tree' else 0" },
"support_xy_distance": { "value": 0.2 },
"support_xy_distance_overhang": { "value": "support_xy_distance" },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ variant = AA 0.4
[values]
speed_infill = 50
top_bottom_thickness = 1.05
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ variant = AA 0.4
[values]
speed_infill = 50
top_bottom_thickness = 1.05
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ variant = AA 0.4
[values]
speed_infill = 50
top_bottom_thickness = 1.05
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ variant = AA 0.4
[values]
speed_infill = 50
top_bottom_thickness = 1.05
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ variant = AA 0.4
[values]
speed_infill = 50
top_bottom_thickness = 1.05
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ variant = AA 0.4
[values]
speed_infill = 50
top_bottom_thickness = 1.05
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ variant = AA 0.4
[values]
speed_infill = 50
top_bottom_thickness = 1.05
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ variant = AA 0.4
[values]
speed_infill = 50
top_bottom_thickness = 1.05
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ variant = AA 0.4
[values]
speed_infill = 50
top_bottom_thickness = 1.05
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ variant = AA 0.4
[values]
speed_infill = 50
top_bottom_thickness = 1.05
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ variant = AA 0.4
[values]
speed_infill = 50
top_bottom_thickness = 1.05
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ variant = AA 0.4
[values]
speed_infill = 50
top_bottom_thickness = 1.05
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ variant = AA 0.4
[values]
speed_infill = 50
top_bottom_thickness = 1.05
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ variant = AA 0.4
[values]
speed_infill = 50
top_bottom_thickness = 1.05
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ variant = AA 0.4
[values]
speed_infill = 50
top_bottom_thickness = 1.05
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ variant = AA 0.4
[values]
speed_infill = 50
top_bottom_thickness = 1.05
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ variant = AA 0.4
[values]
speed_infill = 50
top_bottom_thickness = 1.05
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ variant = AA 0.4
[values]
speed_infill = 50
top_bottom_thickness = 1.05
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(20/50))
speed_wall_x = =math.ceil(speed_wall*(35/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)
z_seam_type = back

Loading

0 comments on commit dd9f196

Please sign in to comment.