Merge remote-tracking branch 'origin/CURA-6522_one_at_a_time_overlapping_build_area' into CURA-6522_one_at_a_time_overlapping_build_area

plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py

@@ -6,7 +6,7 @@ import io #To write config files to strings as if they were files.
 from typing import Dict, List, Optional, Tuple
 
 import UM.VersionUpgrade
-from UM.Logger import Logger
+
 
 ##  Creates a new profile instance by parsing a serialised profile in version 1
 #   of the file format.
@@ -20,6 +20,7 @@ def importFrom(serialised: str, filename: str) -> Optional["Profile"]:
     except (configparser.Error, UM.VersionUpgrade.FormatException, UM.VersionUpgrade.InvalidVersionException):
         return None
 
+
 ##  A representation of a profile used as intermediary form for conversion from
 #   one format to the other.
 class Profile:

plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py

@@ -325,7 +325,9 @@ class VersionUpgrade41to42(VersionUpgrade):
             material_id = parser["containers"]["3"]
             old_quality_id = parser["containers"]["2"]
             if material_id in _creality_quality_per_material and old_quality_id in _creality_quality_per_material[material_id]:
-                parser["containers"]["2"] = _creality_quality_per_material[material_id][old_quality_id]
+                if definition_id == "creality_cr10_extruder_0":  # We can't disambiguate between Creality CR-10 and Creality-CR10S since they share the same extruder definition. Have to go by the name.
+                    if "cr-10s" in parser["metadata"].get("machine", "Creality CR-10").lower():  # Not perfect, since the user can change this name :(
+                        parser["containers"]["2"] = _creality_quality_per_material[material_id][old_quality_id]
 
             stack_copy = {}  # type: Dict[str, str]  # Make a copy so that we don't modify the dict we're iterating over.
             stack_copy.update(parser["containers"])

plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py

@@ -66,6 +66,13 @@ class VersionUpgrade43to44(VersionUpgrade):
             # Alternate skin rotation should be translated to top/bottom line directions.
             if "skin_alternate_rotation" in parser["values"] and parseBool(parser["values"]["skin_alternate_rotation"]):
                 parser["values"]["skin_angles"] = "[45, 135, 0, 90]"
+            # Unit of adaptive layers topography size changed.
+            if "adaptive_layer_height_threshold" in parser["values"]:
+                val = parser["values"]["adaptive_layer_height_threshold"]
+                if val.startswith("="):
+                    val = val[1:]
+                val = "=({val}) / 1000".format(val = val)  # Convert microns to millimetres. Works even if the profile contained a formula.
+                parser["values"]["adaptive_layer_height_threshold"] = val
 
         result = io.StringIO()
         parser.write(result)

plugins/VersionUpgrade/VersionUpgrade44to45/tests/TestVersionUpgrade44To45.py

@@ -10,7 +10,7 @@ definition = creality_cr10s
 
 [metadata]
 type = definition_changes
-setting_version = 10
+setting_version = 11
 
 [values]
 %s