This commit is contained in:
fieldOfView 2016-09-15 13:15:31 +02:00
commit 19b6d716c7

View File

@ -130,6 +130,7 @@ _setting_name_translations = {
"remove_overlapping_walls_enabled": "travel_compensate_overlapping_walls_enabled", "remove_overlapping_walls_enabled": "travel_compensate_overlapping_walls_enabled",
"remove_overlapping_walls_x_enabled": "travel_compensate_overlapping_walls_x_enabled", "remove_overlapping_walls_x_enabled": "travel_compensate_overlapping_walls_x_enabled",
"retraction_hop": "retraction_hop_enabled", "retraction_hop": "retraction_hop_enabled",
"skin_overlap": "infill_overlap",
"skirt_line_width": "skirt_brim_line_width", "skirt_line_width": "skirt_brim_line_width",
"skirt_minimal_length": "skirt_brim_minimal_length", "skirt_minimal_length": "skirt_brim_minimal_length",
"skirt_speed": "skirt_brim_speed", "skirt_speed": "skirt_brim_speed",
@ -390,17 +391,18 @@ class VersionUpgrade21to22(VersionUpgrade):
# \return The same dictionary. # \return The same dictionary.
@staticmethod @staticmethod
def translateSettings(settings): def translateSettings(settings):
new_settings = {}
for key, value in settings.items(): for key, value in settings.items():
if key in _removed_settings: if key in _removed_settings:
del settings[key] continue
elif key == "retraction_combing": #Combing was made into an enum instead of a boolean. if key == "retraction_combing": #Combing was made into an enum instead of a boolean.
settings[key] = "off" if (value == "False") else "all" new_settings[key] = "off" if (value == "False") else "all"
elif key in _setting_name_translations: continue
del settings[key] if key in _setting_name_translations:
settings[_setting_name_translations[key]] = value new_settings[_setting_name_translations[key]] = value
if "infill_overlap" in settings: # New setting, added in 2.3 continue
settings["skin_overlap"] = settings["infill_overlap"] new_settings[key] = value
return settings return new_settings
## Translates a setting name for the change from Cura 2.1 to 2.2. ## Translates a setting name for the change from Cura 2.1 to 2.2.
# #