3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 23:05:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '4.6'

Browse source 
Conflicts:
	plugins/VersionUpgrade/VersionUpgrade460to462/VersionUpgrade460to462.py -> On master we removed the getCfgVersion function, while we moved the entire plug-in to a different folder in 4.6.
	resources/definitions/skriware_2.def.json -> On master we merged a PR that changes more or less all settings, while on 4.6 we doubled the maximum deviation.
This commit is contained in:
Ghostkeeper 2020-05-08 09:10:02 +02:00
commit b02354b209
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
1574 changed files with 1610 additions and 1603 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,7 +26,7 @@ class VersionUpgrade45to46(VersionUpgrade):
parser.read_string(serialized)
# Update version number.
parser["metadata"]["setting_version"] = "12"
parser["metadata"]["setting_version"] = "13"
# Remove deleted settings from the visible settings list.
if "general" in parser and "visible_settings" in parser["general"]:
@ -54,13 +54,20 @@ class VersionUpgrade45to46(VersionUpgrade):
parser.read_string(serialized)
# Update version number.
parser["metadata"]["setting_version"] = "12"
parser["metadata"]["setting_version"] = "13"
if "values" in parser:
for removed in _removed_settings:
if removed in parser["values"]:
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()
parser.write(result)
return [filename], [result.getvalue()]
@ -79,7 +86,7 @@ class VersionUpgrade45to46(VersionUpgrade):
# Update version number.
if "metadata" not in parser:
parser["metadata"] = {}
parser["metadata"]["setting_version"] = "12"
parser["metadata"]["setting_version"] = "13"
result = io.StringIO()
parser.write(result)

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

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

14
plugins/VersionUpgrade/VersionUpgrade46to47/VersionUpgrade46to47.py → plugins/VersionUpgrade/VersionUpgrade460to462/VersionUpgrade460to462.py
View file

@ -6,8 +6,7 @@ from typing import Tuple, List
import io
from UM.VersionUpgrade import VersionUpgrade
class VersionUpgrade46to47(VersionUpgrade):
class VersionUpgrade460to462(VersionUpgrade):
def upgradePreferences(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
"""
Upgrades preferences to have the new version number.
@ -20,7 +19,7 @@ class VersionUpgrade46to47(VersionUpgrade):
parser.read_string(serialized)
# Update version number.
parser["metadata"]["setting_version"] = "13"
parser["metadata"]["setting_version"] = "14"
result = io.StringIO()
parser.write(result)
@ -41,18 +40,19 @@ class VersionUpgrade46to47(VersionUpgrade):
parser.read_string(serialized)
# Update version number.
parser["metadata"]["setting_version"] = "13"
parser["metadata"]["setting_version"] = "14"
if "values" in parser:
# Maximum Deviation's effect was corrected. Previously the deviation
# ended up being only half of what the user had entered. This was
# fixed in Cura 4.7 so there we need to halve the deviation that the
# user had entered.
# user had entered. This halving was accidentally merged into 4.6 and had to be reverted
# back in 4.6.2.
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"
maximum_deviation = "=(" + maximum_deviation + ") * 2"
parser["values"]["meshfix_maximum_deviation"] = maximum_deviation
result = io.StringIO()
@ -73,7 +73,7 @@ class VersionUpgrade46to47(VersionUpgrade):
# Update version number.
if "metadata" not in parser:
parser["metadata"] = {}
parser["metadata"]["setting_version"] = "13"
parser["metadata"]["setting_version"] = "14"
result = io.StringIO()
parser.write(result)

18
plugins/VersionUpgrade/VersionUpgrade46to47/__init__.py → plugins/VersionUpgrade/VersionUpgrade460to462/__init__.py
View file

@ -3,24 +3,24 @@
from typing import Any, Dict, TYPE_CHECKING
from . import VersionUpgrade46to47
from . import VersionUpgrade460to462
if TYPE_CHECKING:
from UM.Application import Application
upgrade = VersionUpgrade46to47.VersionUpgrade46to47()
upgrade = VersionUpgrade460to462.VersionUpgrade460to462()
def getMetaData() -> Dict[str, Any]:
return {
"version_upgrade": {
# From To Upgrade function
("preferences", 6000012): ("preferences", 6000013, upgrade.upgradePreferences),
("machine_stack", 4000012): ("machine_stack", 4000013, upgrade.upgradeStack),
("extruder_train", 4000012): ("extruder_train", 4000013, upgrade.upgradeStack),
("definition_changes", 4000012): ("definition_changes", 4000013, upgrade.upgradeInstanceContainer),
("quality_changes", 4000012): ("quality_changes", 4000013, upgrade.upgradeInstanceContainer),
("quality", 4000012): ("quality", 4000013, upgrade.upgradeInstanceContainer),
("user", 4000012): ("user", 4000013, upgrade.upgradeInstanceContainer),
("preferences", 6000013): ("preferences", 6000014, upgrade.upgradePreferences),
("machine_stack", 4000013): ("machine_stack", 4000014, upgrade.upgradeStack),
("extruder_train", 4000013): ("extruder_train", 4000014, upgrade.upgradeStack),
("definition_changes", 4000013): ("definition_changes", 4000014, upgrade.upgradeInstanceContainer),
("quality_changes", 4000013): ("quality_changes", 4000014, upgrade.upgradeInstanceContainer),
("quality", 4000013): ("quality", 4000014, upgrade.upgradeInstanceContainer),
("user", 4000013): ("user", 4000014, upgrade.upgradeInstanceContainer),
},
"sources": {
"preferences": {

8
plugins/VersionUpgrade/VersionUpgrade460to462/plugin.json Normal file
View file

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

8
plugins/VersionUpgrade/VersionUpgrade46to47/plugin.json
View file

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