Просмотр исходного кода

Fix HMS434 version upgrade

CURA-6774
Lipu Fei 5 лет назад
Родитель
Сommit
1977a865f1

+ 1 - 1
cura/CuraApplication.py

@@ -145,7 +145,7 @@ class CuraApplication(QtApplication):
     # SettingVersion represents the set of settings available in the machine/extruder definitions.
     # You need to make sure that this version number needs to be increased if there is any non-backwards-compatible
     # changes of the settings.
-    SettingVersion = 9
+    SettingVersion = 10
 
     Created = False
 

+ 74 - 0
plugins/VersionUpgrade/VersionUpgrade43to44/VersionUpgrade43to44.py

@@ -0,0 +1,74 @@
+import configparser
+from typing import Tuple, List
+import io
+from UM.VersionUpgrade import VersionUpgrade
+
+_renamed_container_id_map = {
+    # HMS434 "extra coarse", "super coarse", and "ultra coarse" are removed.
+    "hms434_global_Extra_Coarse_Quality": "hms434_global_Normal_Quality",
+    "hms434_global_Super_Coarse_Quality": "hms434_global_Normal_Quality",
+    "hms434_global_Ultra_Coarse_Quality": "hms434_global_Normal_Quality",
+    # HMS434 "0.25", "0.6", "1.2", and "1.5" nozzles are removed.
+    "hms434_0.25tpnozzle": "hms434_0.4tpnozzle",
+    "hms434_0.6tpnozzle": "hms434_0.4tpnozzle",
+    "hms434_1.2tpnozzle": "hms434_0.4tpnozzle",
+    "hms434_1.5tpnozzle": "hms434_0.4tpnozzle",
+}
+
+
+class VersionUpgrade43to44(VersionUpgrade):
+    def getCfgVersion(self, serialised: str) -> int:
+        parser = configparser.ConfigParser(interpolation = None)
+        parser.read_string(serialised)
+        format_version = int(parser.get("general", "version"))  # Explicitly give an exception when this fails. That means that the file format is not recognised.
+        setting_version = int(parser.get("metadata", "setting_version", fallback = "0"))
+        return format_version * 1000000 + setting_version
+
+    ##  Upgrades Preferences to have the new version number.
+    #
+    #   This renames the renamed settings in the list of visible settings.
+    def upgradePreferences(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
+        parser = configparser.ConfigParser(interpolation = None)
+        parser.read_string(serialized)
+
+        # Update version number.
+        parser["metadata"]["setting_version"] = "10"
+
+        result = io.StringIO()
+        parser.write(result)
+        return [filename], [result.getvalue()]
+
+    ##  Upgrades instance containers to have the new version
+    #   number.
+    #
+    #   This renames the renamed settings in the containers.
+    def upgradeInstanceContainer(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
+        parser = configparser.ConfigParser(interpolation = None)
+        parser.read_string(serialized)
+
+        # Update version number.
+        parser["metadata"]["setting_version"] = "10"
+
+        result = io.StringIO()
+        parser.write(result)
+        return [filename], [result.getvalue()]
+
+    ##  Upgrades stacks to have the new version number.
+    def upgradeStack(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
+        parser = configparser.ConfigParser(interpolation = None)
+        parser.read_string(serialized)
+
+        # Update version number.
+        if "metadata" not in parser:
+            parser["metadata"] = {}
+        parser["metadata"]["setting_version"] = "10"
+
+        if "containers" in parser:
+            # Update renamed containers
+            for key, value in parser["containers"].items():
+                if value in _renamed_container_id_map:
+                    parser["containers"][key] = _renamed_container_id_map[value]
+
+        result = io.StringIO()
+        parser.write(result)
+        return [filename], [result.getvalue()]

+ 61 - 0
plugins/VersionUpgrade/VersionUpgrade43to44/__init__.py

@@ -0,0 +1,61 @@
+# Copyright (c) 2019 Ultimaker B.V.
+# Cura is released under the terms of the LGPLv3 or higher.
+
+from typing import Any, Dict, TYPE_CHECKING
+
+from . import VersionUpgrade43to44
+
+
+if TYPE_CHECKING:
+    from UM.Application import Application
+
+upgrade = VersionUpgrade43to44.VersionUpgrade43to44()
+
+
+def getMetaData() -> Dict[str, Any]:
+    return {
+        "version_upgrade": {
+            # From                           To                              Upgrade function
+            ("preferences", 6000009): ("preferences", 6000010, upgrade.upgradePreferences),
+            ("machine_stack", 4000009): ("machine_stack", 4000010, upgrade.upgradeStack),
+            ("extruder_train", 4000009): ("extruder_train", 4000010, upgrade.upgradeStack),
+            ("definition_changes", 4000009): ("definition_changes", 4000010, upgrade.upgradeInstanceContainer),
+            ("quality_changes", 4000009): ("quality_changes", 4000010, upgrade.upgradeInstanceContainer),
+            ("quality", 4000009): ("quality", 4000010, upgrade.upgradeInstanceContainer),
+            ("user", 4000009): ("user", 4000010, upgrade.upgradeInstanceContainer),
+        },
+        "sources": {
+            "preferences": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"."}
+            },
+            "machine_stack": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./machine_instances"}
+            },
+            "extruder_train": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./extruders"}
+            },
+            "definition_changes": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./definition_changes"}
+            },
+            "quality_changes": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./quality_changes"}
+            },
+            "quality": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./quality"}
+            },
+            "user": {
+                "get_version": upgrade.getCfgVersion,
+                "location": {"./user"}
+            }
+        }
+    }
+
+
+def register(app: "Application") -> Dict[str, Any]:
+    return {"version_upgrade": upgrade}

+ 8 - 0
plugins/VersionUpgrade/VersionUpgrade43to44/plugin.json

@@ -0,0 +1,8 @@
+{
+    "name": "Version Upgrade 4.3 to 4.4",
+    "author": "Ultimaker B.V.",
+    "version": "1.0.0",
+    "description": "Upgrades configurations from Cura 4.3 to Cura 4.4.",
+    "api": "6.0",
+    "i18n-catalog": "cura"
+}

+ 1 - 1
resources/quality/abax_pri3/apri3_pla_fast.inst.cfg

@@ -4,7 +4,7 @@ name = Fine
 definition = abax_pri3
 
 [metadata]
-setting_version = 9
+setting_version = 10
 type = quality
 quality_type = normal
 weight = 0

+ 1 - 1
resources/quality/abax_pri3/apri3_pla_high.inst.cfg

@@ -4,7 +4,7 @@ name = Extra Fine
 definition = abax_pri3
 
 [metadata]
-setting_version = 9
+setting_version = 10
 type = quality
 quality_type = high
 weight = 1

+ 1 - 1
resources/quality/abax_pri3/apri3_pla_normal.inst.cfg

@@ -4,7 +4,7 @@ name = Fine
 definition = abax_pri3
 
 [metadata]
-setting_version = 9
+setting_version = 10
 type = quality
 quality_type = normal
 weight = 0

+ 1 - 1
resources/quality/abax_pri5/apri5_pla_fast.inst.cfg

@@ -4,7 +4,7 @@ name = Fine
 definition = abax_pri5
 
 [metadata]
-setting_version = 9
+setting_version = 10
 type = quality
 quality_type = normal
 weight = 0

+ 1 - 1
resources/quality/abax_pri5/apri5_pla_high.inst.cfg

@@ -4,7 +4,7 @@ name = Extra Fine
 definition = abax_pri5
 
 [metadata]
-setting_version = 9
+setting_version = 10
 type = quality
 quality_type = high
 weight = 1

+ 1 - 1
resources/quality/abax_pri5/apri5_pla_normal.inst.cfg

@@ -4,7 +4,7 @@ name = Fine
 definition = abax_pri5
 
 [metadata]
-setting_version = 9
+setting_version = 10
 type = quality
 quality_type = normal
 weight = 0

Некоторые файлы не были показаны из-за большого количества измененных файлов