3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 14:44:13 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge version upgrade 45to46 with 46to47

Browse source 
CURA-7421
This commit is contained in:
Kostas Karmas 2020-05-04 13:00:17 +02:00
parent c29ebc8a77
commit 524a072420
2 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
plugins/VersionUpgrade/VersionUpgrade45to46/VersionUpgrade45to46.py
View file

@ -32,7 +32,7 @@ class VersionUpgrade45to46(VersionUpgrade):
parser.read_string(serialized) parser.read_string(serialized)
# Update version number. # Update version number.
parser["metadata"]["setting_version"] = "12" parser["metadata"]["setting_version"] = "13"
# Remove deleted settings from the visible settings list. # Remove deleted settings from the visible settings list.
visible_settings = set(parser["general"]["visible_settings"].split(";")) visible_settings = set(parser["general"]["visible_settings"].split(";"))
@ -59,13 +59,20 @@ class VersionUpgrade45to46(VersionUpgrade):
parser.read_string(serialized) parser.read_string(serialized)
# Update version number. # Update version number.
parser["metadata"]["setting_version"] = "12" parser["metadata"]["setting_version"] = "13"
if "values" in parser: if "values" in parser:
for removed in _removed_settings: for removed in _removed_settings:
if removed in parser["values"]: if removed in parser["values"]:
del parser["values"][removed] del parser["values"][removed]
if "meshfix_maximum_deviation" in parser["values"]:
maximum_deviation = parser["values"]["meshfix_maximum_deviation"]
if maximum_deviation.startswith("="):
maximum_deviation = maximum_deviation[1:]
maximum_deviation = "=(" + maximum_deviation + ") / 2"
parser["values"]["meshfix_maximum_deviation"] = maximum_deviation
result = io.StringIO() result = io.StringIO()
parser.write(result) parser.write(result)
return [filename], [result.getvalue()] return [filename], [result.getvalue()]
@ -84,7 +91,7 @@ class VersionUpgrade45to46(VersionUpgrade):
# Update version number. # Update version number.
if "metadata" not in parser: if "metadata" not in parser:
parser["metadata"] = {} parser["metadata"] = {}
parser["metadata"]["setting_version"] = "12" parser["metadata"]["setting_version"] = "13"
result = io.StringIO() result = io.StringIO()
parser.write(result) parser.write(result)

14
plugins/VersionUpgrade/VersionUpgrade45to46/__init__.py
View file

@ -14,13 +14,13 @@ def getMetaData() -> Dict[str, Any]:
return { return {
"version_upgrade": { "version_upgrade": {
# From To Upgrade function # From To Upgrade function
("preferences", 6000011): ("preferences", 6000012, upgrade.upgradePreferences), ("preferences", 6000011): ("preferences", 6000013, upgrade.upgradePreferences),
("machine_stack", 4000011): ("machine_stack", 4000012, upgrade.upgradeStack), ("machine_stack", 4000011): ("machine_stack", 4000013, upgrade.upgradeStack),
("extruder_train", 4000011): ("extruder_train", 4000012, upgrade.upgradeStack), ("extruder_train", 4000011): ("extruder_train", 4000013, upgrade.upgradeStack),
("definition_changes", 4000011): ("definition_changes", 4000012, upgrade.upgradeInstanceContainer), ("definition_changes", 4000011): ("definition_changes", 4000013, upgrade.upgradeInstanceContainer),
("quality_changes", 4000011): ("quality_changes", 4000012, upgrade.upgradeInstanceContainer), ("quality_changes", 4000011): ("quality_changes", 4000013, upgrade.upgradeInstanceContainer),
("quality", 4000011): ("quality", 4000012, upgrade.upgradeInstanceContainer), ("quality", 4000011): ("quality", 4000013, upgrade.upgradeInstanceContainer),
("user", 4000011): ("user", 4000012, upgrade.upgradeInstanceContainer), ("user", 4000011): ("user", 4000013, upgrade.upgradeInstanceContainer),
}, },
"sources": { "sources": {
"preferences": { "preferences": {