Merge pull request #10261 from Ultimaker/CURA-8468_fix_project_loading

Fix project loading Arachne
This commit is contained in:
Jelle Spijker 2021-08-13 09:27:28 +02:00 committed by GitHub
commit 7f79ccdf33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions

View file

@ -377,7 +377,9 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
# - the global stack DOESN'T exist but some/all of the extruder stacks exist
# To simplify this, only check if the global stack exists or not
global_stack_id = self._stripFileToId(global_stack_file)
serialized = archive.open(global_stack_file).read().decode("utf-8")
serialized = GlobalStack._updateSerialized(serialized, global_stack_file)
machine_name = self._getMachineNameFromSerializedStack(serialized)
self._machine_info.metadata_dict = self._getMetaDataDictFromSerializedStack(serialized)

View file

@ -109,6 +109,8 @@ class VersionUpgrade49to50(VersionUpgrade):
# Update version number.
if "metadata" not in parser:
parser["metadata"] = {}
parser["general"]["version"] = "5"
parser["metadata"]["setting_version"] = "18"
result = io.StringIO()

View file

@ -15,8 +15,8 @@ def getMetaData() -> Dict[str, Any]:
"version_upgrade": {
# From To Upgrade function
("preferences", 6000016): ("preferences", 6000018, upgrade.upgradePreferences),
("machine_stack", 4000016): ("machine_stack", 4000018, upgrade.upgradeStack),
("extruder_train", 4000016): ("extruder_train", 4000018, upgrade.upgradeStack),
("machine_stack", 4000016): ("machine_stack", 5000018, upgrade.upgradeStack),
("extruder_train", 4000016): ("extruder_train", 5000018, upgrade.upgradeStack),
("definition_changes", 4000016): ("definition_changes", 4000018, upgrade.upgradeInstanceContainer),
("quality_changes", 4000016): ("quality_changes", 4000018, upgrade.upgradeInstanceContainer),
("quality", 4000016): ("quality", 4000018, upgrade.upgradeInstanceContainer),