GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-16 04:15:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Ultimaker/Cura

Browse Source
This commit is contained in:
fieldOfView 2016-09-14 17:40:12 +02:00
commit 35d95c74f0
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py
View File

@ -80,7 +80,7 @@ class Profile:
import VersionUpgrade21to22 # Import here to prevent circular dependencies. import VersionUpgrade21to22 # Import here to prevent circular dependencies.
if self._name == "Current settings": if self._name == "Current settings":
return None #Can't upgrade these, because the new current profile needs to specify the definition ID and the old file only had the machine instance, not the definition. return None, None #Can't upgrade these, because the new current profile needs to specify the definition ID and the old file only had the machine instance, not the definition.
config = configparser.ConfigParser(interpolation = None) config = configparser.ConfigParser(interpolation = None)

8
plugins/VersionUpgrade/VersionUpgrade21to22/VersionUpgrade21to22.py
View File

@ -118,6 +118,12 @@ _profile_translations = {
"tpu_0.6_fast": "um2p_tpu_0.6_fast" "tpu_0.6_fast": "um2p_tpu_0.6_fast"
} }
## Settings that are no longer in the new version.
_removed_settings = {
"fill_perimeter_gaps",
"support_area_smoothing"
}
## How to translate setting names from the old version to the new. ## How to translate setting names from the old version to the new.
_setting_name_translations = { _setting_name_translations = {
"remove_overlapping_walls_0_enabled": "travel_compensate_overlapping_walls_0_enabled", "remove_overlapping_walls_0_enabled": "travel_compensate_overlapping_walls_0_enabled",
@ -385,7 +391,7 @@ class VersionUpgrade21to22(VersionUpgrade):
@staticmethod @staticmethod
def translateSettings(settings): def translateSettings(settings):
for key, value in settings.items(): for key, value in settings.items():
if key == "fill_perimeter_gaps": #Setting is removed. if key in _removed_settings:
del settings[key] del settings[key]
elif key == "retraction_combing": #Combing was made into an enum instead of a boolean. elif key == "retraction_combing": #Combing was made into an enum instead of a boolean.
settings[key] = "off" if (value == "False") else "all" settings[key] = "off" if (value == "False") else "all"