Refactor code

CURA-3710

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):

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:

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)
             }
         }
 

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")