3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 06:33:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Split ContainerManager::mergeContainer into a checking bit and a function that does the actual work

Browse source 
Contributes to CURA-2006
This commit is contained in:
Arjen Hiemstra 2016-08-04 02:10:28 +02:00
parent 6eed25f145
commit 95c3aa8251
1 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

26
cura/Settings/ContainerManager.py
View file

@ -135,12 +135,11 @@ class ContainerManager(QObject):
merge = containers[0] merge = containers[0]
if type(merge) != type(merge_into): if not isinstance(merge, type(merge_into)):
UM.Logger.log("w", "Cannot merge two containers of different types") UM.Logger.log("w", "Cannot merge two containers of different types")
return False return False
for key in merge.getAllKeys(): self._performMerge(merge_into, merge)
merge_into.setProperty(key, "value", merge.getProperty(key, "value"))
return True return True
@ -350,6 +349,22 @@ class ContainerManager(QObject):
return { "status": "success", "message": "Successfully imported container {0}".format(container.getName()) } return { "status": "success", "message": "Successfully imported container {0}".format(container.getName()) }
# Factory function, used by QML
@staticmethod
def createContainerManager(engine, js_engine):
return ContainerManager()
def _performMerge(self, merge_into, merge):
assert isinstance(merge, type(merge_into))
if merge == merge_into:
return
for key in merge.getAllKeys():
merge_into.setProperty(key, "value", merge.getProperty(key, "value"))
merge.clear()
def _updateContainerNameFilters(self): def _updateContainerNameFilters(self):
self._container_name_filters = {} self._container_name_filters = {}
for plugin_id, container_type in UM.Settings.ContainerRegistry.getContainerTypes(): for plugin_id, container_type in UM.Settings.ContainerRegistry.getContainerTypes():
@ -393,8 +408,3 @@ class ContainerManager(QObject):
name_filter = "{0} ({1})".format(mime_type.comment, suffix_list) name_filter = "{0} ({1})".format(mime_type.comment, suffix_list)
self._container_name_filters[name_filter] = entry self._container_name_filters[name_filter] = entry
# Factory function, used by QML
@staticmethod
def createContainerManager(engine, js_engine):
return ContainerManager()