Skip to content

Commit

Permalink
Merge branch '5.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
@jellespijker
jellespijker committed Oct 9, 2023
2 parents 1433c38 + 5c17174 commit dcd01db
Show file tree
Hide file tree
Showing 110 changed files with 3,259 additions and 7 deletions.
4 changes: 3 additions & 1 deletion cura/Machines/Models/IntentCategoryModel.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ def _get_translations(cls):
"""
if len(cls._translations) == 0:
cls._translations["default"] = {
"name": catalog.i18nc("@label", "Default")
"name": catalog.i18nc("@label", "Balanced"),
"description": catalog.i18nc("@text",
"The balanced profile is designed to strike a balance between productivity, surface quality, mechanical properties and dimensional accuracy.")
}
cls._translations["visual"] = {
"name": catalog.i18nc("@label", "Visual"),
Expand Down
4 changes: 3 additions & 1 deletion cura/Machines/Models/IntentTranslations.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@

intent_translations = collections.OrderedDict() # type: collections.OrderedDict[str, Dict[str, Optional[str]]]
intent_translations["default"] = {
"name": catalog.i18nc("@label", "Default")
"name": catalog.i18nc("@label", "Balanced"),
"description": catalog.i18nc("@text",
"The balanced profile is designed to strike a balance between productivity, surface quality, mechanical properties and dimensional accuracy.")
}
intent_translations["visual"] = {
"name": catalog.i18nc("@label", "Visual"),
Expand Down
2 changes: 1 addition & 1 deletion cura/Machines/Models/QualityManagementModel.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ def _update(self):
"quality_type": quality_group.quality_type,
"quality_changes_group": None,
"intent_category": "default",
"section_name": catalog.i18nc("@label", "Default"),
"section_name": catalog.i18nc("@label", "Balanced"),
"layer_height": layer_height, # layer_height is only used for sorting
}
item_list.append(item)
Expand Down
3 changes: 3 additions & 0 deletions cura/Settings/CuraFormulaFunctions.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ def getValueInExtruder(self, extruder_position: int, property_key: str,
if isinstance(value, SettingFunction):
value = value(extruder_stack, context = context)

if isinstance(value, str):
value = value.lower()

return value

def _getActiveExtruders(self, context: Optional["PropertyEvaluationContext"] = None) -> List[str]:
Expand Down
2 changes: 1 addition & 1 deletion cura/UI/ObjectsModel.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def __init__(self, parent = None) -> None:
self._group_name_template = catalog.i18nc("@label", "Group #{group_nr}")
self._group_name_prefix = self._group_name_template.split("#")[0]

self._naming_regex = re.compile("^(.+)\(([0-9]+)\)$")
self._naming_regex = re.compile(r"^(.+)\(([0-9]+)\)$")

def setActiveBuildPlate(self, nr: int) -> None:
if self._build_plate_number != nr:
Expand Down
120 changes: 117 additions & 3 deletions resources/definitions/fdmprinter.def.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2861,6 +2861,34 @@
"maximum_value_warning": "150",
"limit_to_extruder": "wall_x_extruder_nr",
"settable_per_mesh": true
},
"wall_0_material_flow_roofing":
{
"label": "Top Surface Outer Wall Flow",
"description": "Flow compensation on the top surface outermost wall line.",
"unit": "%",
"type": "float",
"default_value": 100,
"value": "wall_0_material_flow",
"minimum_value": "0.0001",
"minimum_value_warning": "50",
"maximum_value_warning": "150",
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true
},
"wall_x_material_flow_roofing":
{
"label": "Top Surface Inner Wall(s) Flow",
"description": "Flow compensation on top surface wall lines for all wall lines except the outermost one.",
"unit": "%",
"type": "float",
"default_value": 100,
"value": "wall_x_material_flow",
"minimum_value": "0.0001",
"minimum_value_warning": "50",
"maximum_value_warning": "150",
"limit_to_extruder": "wall_x_extruder_nr",
"settable_per_mesh": true
}
}
},
Expand Down Expand Up @@ -3166,6 +3194,34 @@
"value": "speed_wall * 2",
"limit_to_extruder": "wall_x_extruder_nr",
"settable_per_mesh": true
},
"speed_wall_0_roofing":
{
"label": "Top Surface Outer Wall Speed",
"description": "The speed at which the top surface outermost walls are printed.",
"unit": "mm/s",
"type": "float",
"minimum_value": "0.1",
"maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
"maximum_value_warning": "150",
"default_value": 30,
"value": "speed_wall_0",
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true
},
"speed_wall_x_roofing":
{
"label": "Top Surface Inner Wall Speed",
"description": "The speed at which the top surface inner walls are printed.",
"unit": "mm/s",
"type": "float",
"minimum_value": "0.1",
"maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
"maximum_value_warning": "150",
"default_value": 60,
"value": "speed_wall_x",
"limit_to_extruder": "wall_x_extruder_nr",
"settable_per_mesh": true
}
}
},
Expand Down Expand Up @@ -3509,6 +3565,36 @@
"enabled": "resolveOrValue('acceleration_enabled')",
"limit_to_extruder": "wall_x_extruder_nr",
"settable_per_mesh": true
},
"acceleration_wall_0_roofing":
{
"label": "Top Surface Outer Wall Acceleration",
"description": "The acceleration with which the top surface outermost walls are printed.",
"unit": "mm/s\u00b2",
"type": "float",
"minimum_value": "0.1",
"minimum_value_warning": "100",
"maximum_value_warning": "10000",
"default_value": 3000,
"value": "acceleration_wall_0",
"enabled": "resolveOrValue('acceleration_enabled')",
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true
},
"acceleration_wall_x_roofing":
{
"label": "Top Surface Inner Wall Acceleration",
"description": "The acceleration with which the top surface inner walls are printed.",
"unit": "mm/s\u00b2",
"type": "float",
"minimum_value": "0.1",
"minimum_value_warning": "100",
"maximum_value_warning": "10000",
"default_value": 3000,
"value": "acceleration_wall_x",
"enabled": "resolveOrValue('acceleration_enabled')",
"limit_to_extruder": "wall_x_extruder_nr",
"settable_per_mesh": true
}
}
},
Expand Down Expand Up @@ -3808,6 +3894,34 @@
"enabled": "resolveOrValue('jerk_enabled')",
"limit_to_extruder": "wall_x_extruder_nr",
"settable_per_mesh": true
},
"jerk_wall_0_roofing":
{
"label": "Top Surface Outer Wall Jerk",
"description": "The maximum instantaneous velocity change with which the top surface outermost walls are printed.",
"unit": "mm/s",
"type": "float",
"minimum_value": "0",
"maximum_value_warning": "50",
"default_value": 20,
"value": "jerk_wall_0",
"enabled": "resolveOrValue('jerk_enabled')",
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true
},
"jerk_wall_x_roofing":
{
"label": "Top Surface Inner Wall Jerk",
"description": "The maximum instantaneous velocity change with which the top surface inner walls are printed.",
"unit": "mm/s",
"type": "float",
"minimum_value": "0",
"maximum_value_warning": "50",
"default_value": 20,
"value": "jerk_wall_x",
"enabled": "resolveOrValue('jerk_enabled')",
"limit_to_extruder": "wall_x_extruder_nr",
"settable_per_mesh": true
}
}
},
Expand Down Expand Up @@ -4534,7 +4648,7 @@
"type": "extruder",
"default_value": "0",
"value": "support_extruder_nr",
"enabled": "(support_enable or support_meshes_present) and extruders_enabled_count > 1",
"enabled": "(support_enable or support_meshes_present) and extruders_enabled_count > 1 and support_interface_enable",
"resolve": "max(extruderValues('support_interface_extruder_nr'))",
"settable_per_mesh": false,
"settable_per_extruder": false,
Expand All @@ -4547,7 +4661,7 @@
"type": "extruder",
"default_value": "0",
"value": "support_interface_extruder_nr",
"enabled": "(support_enable or support_meshes_present) and extruders_enabled_count > 1",
"enabled": "(support_enable or support_meshes_present) and extruders_enabled_count > 1 and support_roof_enable",
"resolve": "max(extruderValues('support_roof_extruder_nr'))",
"settable_per_mesh": false,
"settable_per_extruder": false
Expand All @@ -4559,7 +4673,7 @@
"type": "extruder",
"default_value": "0",
"value": "support_interface_extruder_nr",
"enabled": "(support_enable or support_meshes_present) and extruders_enabled_count > 1",
"enabled": "(support_enable or support_meshes_present) and extruders_enabled_count > 1 and support_bottom_enable",
"resolve": "max(extruderValues('support_bottom_extruder_nr'))",
"settable_per_mesh": false,
"settable_per_extruder": false
Expand Down
1 change: 1 addition & 0 deletions resources/definitions/ultimaker_s3.def.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
0
],
"platform_texture": "UltimakerS3backplate.png",
"preferred_material": "ultimaker_pla_blue",
"preferred_quality_type": "draft",
"preferred_variant_name": "AA 0.4",
"supported_actions": [ "DiscoverUM3Action" ],
Expand Down
1 change: 1 addition & 0 deletions resources/definitions/ultimaker_s5.def.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
-10
],
"platform_texture": "UltimakerS5backplate.png",
"preferred_material": "ultimaker_pla_blue",
"preferred_quality_type": "draft",
"preferred_variant_buildplate_name": "Glass",
"preferred_variant_name": "AA 0.4",
Expand Down
1 change: 1 addition & 0 deletions resources/definitions/ultimaker_s7.def.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
0
],
"platform_texture": "UltimakerS7backplate.png",
"preferred_material": "ultimaker_pla_blue",
"preferred_variant_name": "AA 0.4",
"quality_definition": "ultimaker_s5",
"supported_actions": [ "DiscoverUM3Action" ],
Expand Down
17 changes: 17 additions & 0 deletions resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.06mm_visual.inst.cfg
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
[general]
definition = ultimaker_s3
name = Visual
version = 4

[metadata]
intent_category = visual
material = ultimaker_abs
quality_type = high
setting_version = 22
type = intent
variant = AA 0.4

[values]
speed_infill = 50
top_bottom_thickness = 1.05

28 changes: 28 additions & 0 deletions resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.15mm_engineering.inst.cfg
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
[general]
definition = ultimaker_s3
name = Accurate
version = 4

[metadata]
intent_category = engineering
material = ultimaker_abs
quality_type = fast
setting_version = 22
type = intent
variant = AA 0.4

[values]
_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
infill_sparse_density = 20
jerk_print = 30
speed_infill = =speed_print
speed_print = 35
speed_roofing = =speed_topbottom
speed_topbottom = =speed_print
speed_wall = =speed_print
speed_wall_0 = =speed_wall
speed_wall_x = =speed_wall
top_bottom_thickness = =wall_thickness
wall_thickness = =line_width * 3

24 changes: 24 additions & 0 deletions resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.15mm_visual.inst.cfg
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
[general]
definition = ultimaker_s3
name = Visual
version = 4

[metadata]
intent_category = visual
material = ultimaker_abs
quality_type = fast
setting_version = 22
type = intent
variant = AA 0.4

[values]
_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
acceleration_print = 2500
acceleration_wall_0 = 1000
inset_direction = inside_out
jerk_wall_0 = 20
speed_print = 50
speed_roofing = =math.ceil(speed_wall*(35/50))
speed_wall_0 = =math.ceil(speed_wall*(25/50))
top_bottom_thickness = =max(1.2 , layer_height * 6)

24 changes: 24 additions & 0 deletions resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.1mm_engineering.inst.cfg
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
[general]
definition = ultimaker_s3
name = Accurate
version = 4

[metadata]
intent_category = engineering
material = ultimaker_abs
quality_type = normal
setting_version = 22
type = intent
variant = AA 0.4

[values]
jerk_print = 30
speed_infill = =speed_print
speed_print = 30
speed_topbottom = =speed_print
speed_wall = =speed_print
speed_wall_0 = =speed_wall
speed_wall_x = =speed_wall
top_bottom_thickness = =wall_thickness
wall_thickness = =line_width * 3

17 changes: 17 additions & 0 deletions resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.1mm_visual.inst.cfg
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
[general]
definition = ultimaker_s3
name = Visual
version = 4

[metadata]
intent_category = visual
material = ultimaker_abs
quality_type = normal
setting_version = 22
type = intent
variant = AA 0.4

[values]
speed_infill = 50
top_bottom_thickness = 1.05

28 changes: 28 additions & 0 deletions resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.2mm_engineering.inst.cfg
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
[general]
definition = ultimaker_s3
name = Accurate
version = 4

[metadata]
intent_category = engineering
material = ultimaker_abs
quality_type = draft
setting_version = 22
type = intent
variant = AA 0.4

[values]
_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
infill_sparse_density = 20
jerk_print = 30
speed_infill = =speed_print
speed_print = 35
speed_roofing = =speed_topbottom
speed_topbottom = =speed_print
speed_wall = =speed_print
speed_wall_0 = =speed_wall
speed_wall_x = =speed_wall
top_bottom_thickness = =wall_thickness
wall_thickness = =line_width * 3

Loading

0 comments on commit dcd01db

Please sign in to comment.