3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Refactor code

Browse source 
CURA-3710
This commit is contained in:
Lipu Fei 2018-02-01 13:56:49 +01:00
parent 1801f1f27c
commit 367e50669d
7 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

32
cura/CuraApplication.py
View file

@ -354,16 +354,16 @@ class CuraApplication(QtApplication):
setting_visibily_preset_names = self.getVisibilitySettingPresetTypes() setting_visibily_preset_names = self.getVisibilitySettingPresetTypes()
preferences.setDefault("general/visible_settings_preset", setting_visibily_preset_names) 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" default_preset_visibility_group_name = "Basic"
if visible_settings_preset_choice == "" or visible_settings_preset_choice is None: if preset_setting_visibility_choice == "" or preset_setting_visibility_choice is None:
if not visible_settings_preset_choice in setting_visibily_preset_names: if preset_setting_visibility_choice not in setting_visibily_preset_names:
visible_settings_preset_choice = default_visibility_preset 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", 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.applicationShuttingDown.connect(self.saveSettings)
self.engineCreatedSignal.connect(self._onEngineCreated) self.engineCreatedSignal.connect(self._onEngineCreated)
@ -377,14 +377,14 @@ class CuraApplication(QtApplication):
@pyqtSlot(str, result = str) @pyqtSlot(str, result = str)
def getVisibilitySettingPreset(self, settings_preset_name) -> str: def getVisibilitySettingPreset(self, settings_preset_name) -> str:
result = self._load_visibilyty_setting_preset(settings_preset_name) result = self._loadPresetSettingVisibilityGroup(settings_preset_name)
formatted_preset_settings = self.format_visibility_setting_preset(result) formatted_preset_settings = self._serializePresetSettingVisibilityData(result)
return formatted_preset_settings 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 = "" result_string = ""
for key in settings_data: for key in settings_data:
@ -394,10 +394,10 @@ class CuraApplication(QtApplication):
return result_string 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]: def _loadPresetSettingVisibilityGroup(self, visibility_preset_name) -> Dict[str, str]:
preset_dir = Resources.getPath(Resources.VisibilitySettingPresets) preset_dir = Resources.getPath(Resources.PresetSettingVisibilityGroups)
result = {} result = {}
right_preset_found = False right_preset_found = False
@ -422,7 +422,7 @@ class CuraApplication(QtApplication):
continue continue
else: else:
section_settings = [] section_settings = []
for option in parser[section]._options(): for option in parser[section].keys():
section_settings.append(option) section_settings.append(option)
result[section] = section_settings result[section] = section_settings
@ -438,7 +438,7 @@ class CuraApplication(QtApplication):
## Check visibility setting preset folder and returns available types ## Check visibility setting preset folder and returns available types
# #
def getVisibilitySettingPresetTypes(self): def getVisibilitySettingPresetTypes(self):
preset_dir = Resources.getPath(Resources.VisibilitySettingPresets) preset_dir = Resources.getPath(Resources.PresetSettingVisibilityGroups)
result = {} result = {}
for item in os.listdir(preset_dir): for item in os.listdir(preset_dir):

2
plugins/3MFReader/ThreeMFWorkspaceReader.py
View file

@ -453,7 +453,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
Logger.log("w", "Workspace did not contain visible settings. Leaving visibility unchanged") Logger.log("w", "Workspace did not contain visible settings. Leaving visibility unchanged")
else: else:
global_preferences.setValue("general/visible_settings", visible_settings) 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") categories_expanded = temp_preferences.getValue("cura/categories_expanded")
if categories_expanded is None: if categories_expanded is None:

0
resources/visibility_presets/advanced.cfg → resources/preset_setting_visibility_groups/advanced.cfg
View file

0
resources/visibility_presets/basic.cfg → resources/preset_setting_visibility_groups/basic.cfg
View file

0
resources/visibility_presets/expert.cfg → resources/preset_setting_visibility_groups/expert.cfg
View file

4
resources/qml/Preferences/SettingVisibilityPage.qml
View file

@ -154,7 +154,7 @@ UM.PreferencesPage
currentIndex: currentIndex:
{ {
// Load previously selected preset. // 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) var newVisibleSettings = CuraApplication.getVisibilitySettingPreset(model.get(index).text)
UM.Preferences.setValue("general/visible_settings", newVisibleSettings) 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)
} }
} }

2
tools/check_preset_settings.py
View file

@ -11,7 +11,7 @@ class PresetSettingsValidator:
self._cura_dir = os.path.abspath(cura_dir) self._cura_dir = os.path.abspath(cura_dir)
self._resource_dir = os.path.join(self._cura_dir, "resources") self._resource_dir = os.path.join(self._cura_dir, "resources")
self._definitions_dir = os.path.join(self._resource_dir, "definitions") 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") self._fdmprinter_def_path = os.path.join(self._definitions_dir, "fdmprinter.def.json")