GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-13 03:19:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0'

Browse Source
This commit is contained in:
Ghostkeeper 2017-09-29 09:15:52 +02:00
commit 17f0be6d56
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cura/Settings/QualitySettingsModel.py
View File

@ -1,11 +1,11 @@
# Copyright (c) 2016 Ultimaker B.V. # Copyright (c) 2017 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher. # Cura is released under the terms of the LGPLv3 or higher.
import collections import collections
from PyQt5.QtCore import pyqtProperty, pyqtSignal, Qt from PyQt5.QtCore import pyqtProperty, pyqtSignal, Qt
import UM.Logger from UM.Logger import Logger
import UM.Qt import UM.Qt
from UM.Application import Application from UM.Application import Application
from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.ContainerRegistry import ContainerRegistry
@ -97,7 +97,7 @@ class QualitySettingsModel(UM.Qt.ListModel.ListModel):
containers = self._container_registry.findInstanceContainers(id = self._quality_id) containers = self._container_registry.findInstanceContainers(id = self._quality_id)
if not containers: if not containers:
UM.Logger.log("w", "Could not find a quality container with id %s", self._quality_id) Logger.log("w", "Could not find a quality container with id %s", self._quality_id)
return return
quality_container = None quality_container = None
@ -116,7 +116,7 @@ class QualitySettingsModel(UM.Qt.ListModel.ListModel):
quality_container = self._container_registry.findInstanceContainers(**criteria) quality_container = self._container_registry.findInstanceContainers(**criteria)
if not quality_container: if not quality_container:
UM.Logger.log("w", "Could not find a quality container matching quality changes %s", quality_changes_container.getId()) Logger.log("w", "Could not find a quality container matching quality changes %s", quality_changes_container.getId())
return return
quality_container = quality_container[0] quality_container = quality_container[0]
@ -160,7 +160,7 @@ class QualitySettingsModel(UM.Qt.ListModel.ListModel):
containers = self._container_registry.findInstanceContainers(**criteria) containers = self._container_registry.findInstanceContainers(**criteria)
if not containers: if not containers:
UM.Logger.log("w", "Could not find any quality containers matching the search criteria %s" % str(criteria)) Logger.log("w", "Could not find any quality containers matching the search criteria %s" % str(criteria))
return return
if quality_changes_container: if quality_changes_container:

8
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View File

@ -416,6 +416,7 @@ class XmlMaterialProfile(InstanceContainer):
## Overridden from InstanceContainer ## Overridden from InstanceContainer
def deserialize(self, serialized): def deserialize(self, serialized):
containers_to_add = []
# update the serialized data first # update the serialized data first
from UM.Settings.Interfaces import ContainerInterface from UM.Settings.Interfaces import ContainerInterface
serialized = ContainerInterface.deserialize(self, serialized) serialized = ContainerInterface.deserialize(self, serialized)
@ -573,7 +574,7 @@ class XmlMaterialProfile(InstanceContainer):
new_material._dirty = False new_material._dirty = False
if is_new_material: if is_new_material:
ContainerRegistry.getInstance().addContainer(new_material) containers_to_add.append(new_material)
hotends = machine.iterfind("./um:hotend", self.__namespaces) hotends = machine.iterfind("./um:hotend", self.__namespaces)
for hotend in hotends: for hotend in hotends:
@ -632,7 +633,10 @@ class XmlMaterialProfile(InstanceContainer):
new_hotend_material._dirty = False new_hotend_material._dirty = False
if is_new_material: if is_new_material:
ContainerRegistry.getInstance().addContainer(new_hotend_material) containers_to_add.append(new_hotend_material)
for container_to_add in containers_to_add:
ContainerRegistry.getInstance().addContainer(container_to_add)
def _addSettingElement(self, builder, instance): def _addSettingElement(self, builder, instance):
try: try: