Add all changed materials to version upgrade regex

CURA-10953
This commit is contained in:
Jaime van Kessel 2023-09-08 13:02:32 +02:00
parent 0141b750f5
commit bcd9f9cbf9
No known key found for this signature in database
GPG key ID: C85F7A3AF1BAA7C4

View file

@ -11,7 +11,7 @@ import re
class VersionUpgrade54to55(VersionUpgrade): class VersionUpgrade54to55(VersionUpgrade):
profile_regex = re.compile( profile_regex = re.compile(
r"um\_(?P<machine>s(3|5|7))_(?P<core_type>aa|cc|bb)(?P<nozzle_size>0\.(6|4|8))_(?P<material>pla|petg|abs)_(?P<layer_height>0\.\d{1,2}mm)") r"um\_(?P<machine>s(3|5|7))_(?P<core_type>aa|cc|bb)(?P<nozzle_size>0\.(6|4|8))_(?P<material>pla|petg|abs|cpe|cpe_plus|nylon|pc|petcf|tough_pla|tpu)_(?P<layer_height>0\.\d{1,2}mm)")
@staticmethod @staticmethod
def _isUpgradedUltimakerDefinitionId(definition_id: str) -> bool: def _isUpgradedUltimakerDefinitionId(definition_id: str) -> bool:
@ -63,7 +63,6 @@ class VersionUpgrade54to55(VersionUpgrade):
intent_id = VersionUpgrade54to55.profile_regex.sub( intent_id = VersionUpgrade54to55.profile_regex.sub(
"um_\g<machine>_\g<core_type>\g<nozzle_size>_um-\g<material>_\g<layer_height>", intent_id) "um_\g<machine>_\g<core_type>\g<nozzle_size>_um-\g<material>_\g<layer_height>", intent_id)
parser["containers"]["3"] = quality_id parser["containers"]["3"] = quality_id
parser["containers"]["2"] = intent_id parser["containers"]["2"] = intent_id