3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'CURA-6113_fix_master_version_upgrade' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2019-01-17 13:12:41 +01:00
commit a41cc9efbe
651 changed files with 708 additions and 688 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/VersionUpgrade/VersionUpgrade40to41/VersionUpgrade40to41.py
View file

@ -47,7 +47,7 @@ class VersionUpgrade40to41(VersionUpgrade):
# Update version number.
parser["general"]["version"] = "4"
parser["metadata"]["setting_version"] = "6"
parser["metadata"]["setting_version"] = "7"
result = io.StringIO()
parser.write(result)
@ -62,7 +62,7 @@ class VersionUpgrade40to41(VersionUpgrade):
parser["general"]["version"] = "6"
if "metadata" not in parser:
parser["metadata"] = {}
parser["metadata"]["setting_version"] = "6"
parser["metadata"]["setting_version"] = "7"
result = io.StringIO()
parser.write(result)
@ -75,7 +75,7 @@ class VersionUpgrade40to41(VersionUpgrade):
# Update version number.
parser["general"]["version"] = "4"
parser["metadata"]["setting_version"] = "6"
parser["metadata"]["setting_version"] = "7"
#Update the name of the quality profile.
if parser["containers"]["4"] in _renamed_quality_profiles:
@ -83,4 +83,4 @@ class VersionUpgrade40to41(VersionUpgrade):
result = io.StringIO()
parser.write(result)
return [filename], [result.getvalue()]
return [filename], [result.getvalue()]

34
plugins/VersionUpgrade/VersionUpgrade40to41/__init__.py
View file

@ -14,15 +14,19 @@ def getMetaData() -> Dict[str, Any]:
return {
"version_upgrade": {
# From To Upgrade function
("machine_stack", 4000005): ("machine_stack", 4000006, upgrade.upgradeStack),
("extruder_train", 4000005): ("extruder_train", 4000006, upgrade.upgradeStack),
("preferences", 6000005): ("preferences", 6000006, upgrade.upgradePreferences),
("definition_changes", 4000005): ("definition_changes", 4000006, upgrade.upgradeInstanceContainer),
("quality_changes", 4000005): ("quality_changes", 4000006, upgrade.upgradeInstanceContainer),
("quality", 4000005): ("quality", 4000006, upgrade.upgradeInstanceContainer),
("user", 4000005): ("user", 4000006, upgrade.upgradeInstanceContainer),
("preferences", 6000006): ("preferences", 6000007, upgrade.upgradePreferences),
("machine_stack", 4000006): ("machine_stack", 4000007, upgrade.upgradeStack),
("extruder_train", 4000006): ("extruder_train", 4000007, upgrade.upgradeStack),
("definition_changes", 4000006): ("definition_changes", 4000007, upgrade.upgradeInstanceContainer),
("quality_changes", 4000006): ("quality_changes", 4000007, upgrade.upgradeInstanceContainer),
("quality", 4000006): ("quality", 4000007, upgrade.upgradeInstanceContainer),
("user", 4000006): ("user", 4000007, upgrade.upgradeInstanceContainer),
},
"sources": {
"preferences": {
"get_version": upgrade.getCfgVersion,
"location": {"."}
},
"machine_stack": {
"get_version": upgrade.getCfgVersion,
"location": {"./machine_instances"}
@ -30,6 +34,22 @@ def getMetaData() -> Dict[str, Any]:
"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"}
}
}
}

2
plugins/XmlMaterialProfile/__init__.py
View file

@ -16,7 +16,7 @@ def getMetaData():
"mimetype": "application/x-ultimaker-material-profile"
},
"version_upgrade": {
("materials", 1000000): ("materials", 1000006, upgrader.upgradeMaterial),
("materials", 1000000): ("materials", 1000007, upgrader.upgradeMaterial),
},
"sources": {
"materials": {