From 367e50669d18c48d4c0d45a9c46313ba6f9ccd05 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 1 Feb 2018 13:56:49 +0100 Subject: [PATCH] Refactor code CURA-3710 --- cura/CuraApplication.py | 34 +++++++++---------- plugins/3MFReader/ThreeMFWorkspaceReader.py | 2 +- .../advanced.cfg | 0 .../basic.cfg | 0 .../expert.cfg | 0 .../qml/Preferences/SettingVisibilityPage.qml | 4 +-- tools/check_preset_settings.py | 2 +- 7 files changed, 21 insertions(+), 21 deletions(-) rename resources/{visibility_presets => preset_setting_visibility_groups}/advanced.cfg (100%) rename resources/{visibility_presets => preset_setting_visibility_groups}/basic.cfg (100%) rename resources/{visibility_presets => preset_setting_visibility_groups}/expert.cfg (100%) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 087530a99e..086cc8bd72 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -354,16 +354,16 @@ class CuraApplication(QtApplication): setting_visibily_preset_names = self.getVisibilitySettingPresetTypes() preferences.setDefault("general/visible_settings_preset", setting_visibily_preset_names) - visible_settings_preset_choice = Preferences.getInstance().getValue("general/visible_settings_preset_choice") + preset_setting_visibility_choice = Preferences.getInstance().getValue("general/preset_setting_visibility_choice") - default_visibility_preset = "Basic" - if visible_settings_preset_choice == "" or visible_settings_preset_choice is None: - if not visible_settings_preset_choice in setting_visibily_preset_names: - visible_settings_preset_choice = default_visibility_preset + default_preset_visibility_group_name = "Basic" + if preset_setting_visibility_choice == "" or preset_setting_visibility_choice is None: + if preset_setting_visibility_choice not in setting_visibily_preset_names: + preset_setting_visibility_choice = default_preset_visibility_group_name - visible_settings = self.getVisibilitySettingPreset(settings_preset_name = visible_settings_preset_choice) + visible_settings = self.getVisibilitySettingPreset(settings_preset_name = preset_setting_visibility_choice) preferences.setDefault("general/visible_settings", visible_settings) - preferences.setDefault("general/visible_settings_preset_choice", visible_settings_preset_choice) + preferences.setDefault("general/preset_setting_visibility_choice", preset_setting_visibility_choice) self.applicationShuttingDown.connect(self.saveSettings) self.engineCreatedSignal.connect(self._onEngineCreated) @@ -377,14 +377,14 @@ class CuraApplication(QtApplication): @pyqtSlot(str, result = str) def getVisibilitySettingPreset(self, settings_preset_name) -> str: - result = self._load_visibilyty_setting_preset(settings_preset_name) - formatted_preset_settings = self.format_visibility_setting_preset(result) + result = self._loadPresetSettingVisibilityGroup(settings_preset_name) + formatted_preset_settings = self._serializePresetSettingVisibilityData(result) return formatted_preset_settings - ## Format visibitlity settings into string which is concatenated by ";" + ## Serialise the given preset setting visibitlity group dictionary into a string which is concatenated by ";" # - def format_visibility_setting_preset(self, settings_data) -> str: + def _serializePresetSettingVisibilityData(self, settings_data: dict) -> str: result_string = "" for key in settings_data: @@ -394,10 +394,10 @@ class CuraApplication(QtApplication): return result_string - ## Load visibility settings according to selected preset name + ## Load the preset setting visibility group with the given name # - def _load_visibilyty_setting_preset(self, visibility_preset_name) -> Dict[str, str]: - preset_dir = Resources.getPath(Resources.VisibilitySettingPresets) + def _loadPresetSettingVisibilityGroup(self, visibility_preset_name) -> Dict[str, str]: + preset_dir = Resources.getPath(Resources.PresetSettingVisibilityGroups) result = {} right_preset_found = False @@ -407,7 +407,7 @@ class CuraApplication(QtApplication): if not os.path.isfile(file_path): continue - parser = ConfigParser(allow_no_value=True) # accept options without any value, + parser = ConfigParser(allow_no_value = True) # accept options without any value, try: parser.read([file_path]) @@ -422,7 +422,7 @@ class CuraApplication(QtApplication): continue else: section_settings = [] - for option in parser[section]._options(): + for option in parser[section].keys(): section_settings.append(option) result[section] = section_settings @@ -438,7 +438,7 @@ class CuraApplication(QtApplication): ## Check visibility setting preset folder and returns available types # def getVisibilitySettingPresetTypes(self): - preset_dir = Resources.getPath(Resources.VisibilitySettingPresets) + preset_dir = Resources.getPath(Resources.PresetSettingVisibilityGroups) result = {} for item in os.listdir(preset_dir): diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index c67815b306..b28490ce4e 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -453,7 +453,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader): Logger.log("w", "Workspace did not contain visible settings. Leaving visibility unchanged") else: global_preferences.setValue("general/visible_settings", visible_settings) - global_preferences.setValue("general/visible_settings_preset_choice", "Custom") + global_preferences.setValue("general/preset_setting_visibility_choice", "Custom") categories_expanded = temp_preferences.getValue("cura/categories_expanded") if categories_expanded is None: diff --git a/resources/visibility_presets/advanced.cfg b/resources/preset_setting_visibility_groups/advanced.cfg similarity index 100% rename from resources/visibility_presets/advanced.cfg rename to resources/preset_setting_visibility_groups/advanced.cfg diff --git a/resources/visibility_presets/basic.cfg b/resources/preset_setting_visibility_groups/basic.cfg similarity index 100% rename from resources/visibility_presets/basic.cfg rename to resources/preset_setting_visibility_groups/basic.cfg diff --git a/resources/visibility_presets/expert.cfg b/resources/preset_setting_visibility_groups/expert.cfg similarity index 100% rename from resources/visibility_presets/expert.cfg rename to resources/preset_setting_visibility_groups/expert.cfg diff --git a/resources/qml/Preferences/SettingVisibilityPage.qml b/resources/qml/Preferences/SettingVisibilityPage.qml index 967c0d05bf..561c1f8f9d 100644 --- a/resources/qml/Preferences/SettingVisibilityPage.qml +++ b/resources/qml/Preferences/SettingVisibilityPage.qml @@ -154,7 +154,7 @@ UM.PreferencesPage currentIndex: { // Load previously selected preset. - var text = UM.Preferences.getValue("general/visible_settings_preset_choice"); + var text = UM.Preferences.getValue("general/preset_setting_visibility_choice"); @@ -178,7 +178,7 @@ UM.PreferencesPage var newVisibleSettings = CuraApplication.getVisibilitySettingPreset(model.get(index).text) UM.Preferences.setValue("general/visible_settings", newVisibleSettings) - UM.Preferences.setValue("general/visible_settings_preset_choice", model.get(index).text) + UM.Preferences.setValue("general/preset_setting_visibility_choice", model.get(index).text) } } diff --git a/tools/check_preset_settings.py b/tools/check_preset_settings.py index dfcea4849f..8afad38344 100644 --- a/tools/check_preset_settings.py +++ b/tools/check_preset_settings.py @@ -11,7 +11,7 @@ class PresetSettingsValidator: self._cura_dir = os.path.abspath(cura_dir) self._resource_dir = os.path.join(self._cura_dir, "resources") self._definitions_dir = os.path.join(self._resource_dir, "definitions") - self._preset_settings_dir = os.path.join(self._resource_dir, "visibility_presets") + self._preset_settings_dir = os.path.join(self._resource_dir, "preset_setting_visibility_groups") self._fdmprinter_def_path = os.path.join(self._definitions_dir, "fdmprinter.def.json")