3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 15:44:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge branch '2.3' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2016-09-09 13:28:34 +02:00
commit b6e6871f23
8 changed files with 42 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plugins/CuraEngineBackend/StartSliceJob.py
View file

@ -82,6 +82,13 @@ class StartSliceJob(Job):
self.setResult(StartJobResult.SettingError)
return
for extruder_stack in cura.Settings.ExtruderManager.getInstance().getMachineExtruders(stack.getId()):
material = extruder_stack.findContainer({"type": "material"})
if material:
if material.getMetaDataEntry("compatible") == False:
self.setResult(StartJobResult.SettingError)
return
# Don't slice if there is a per object setting with an error value.
for node in DepthFirstIterator(self._scene.getRoot()):
if type(node) is not SceneNode or not node.isSelectable():

4
plugins/CuraProfileReader/CuraProfileReader.py
View file

@ -54,10 +54,10 @@ class CuraProfileReader(ProfileReader):
if not "general" in parser:
Logger.log("w", "Missing required section 'general'.")
return None
return []
if not "version" in parser["general"]:
Logger.log("w", "Missing required 'version' property")
return None
return []
version = int(parser["general"]["version"])
if InstanceContainer.Version != version:

12
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View file

@ -83,7 +83,6 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
# machine / variant combination: only changes for itself.
def serialize(self):
if self._read_only:
Logger.log("w", "Serializing read-only container [%s], probably a programming error." % self.id)
return
registry = UM.Settings.ContainerRegistry.getInstance()
@ -428,8 +427,8 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
for identifier in identifiers:
machine_id = self.__product_id_map.get(identifier.get("product"), None)
if machine_id is None:
Logger.log("w", "Cannot create material for unknown machine %s", identifier.get("product"))
continue
# Lets try again with some naive heuristics.
machine_id = identifier.get("product").replace(" ", "").lower()
definitions = UM.Settings.ContainerRegistry.getInstance().findDefinitionContainers(id = machine_id)
if not definitions:
@ -454,6 +453,7 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
UM.Settings.ContainerRegistry.getInstance().addContainer(new_material)
hotends = machine.iterfind("./um:hotend", self.__namespaces)
for hotend in hotends:
hotend_id = hotend.get("id")
@ -482,14 +482,12 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
else:
Logger.log("d", "Unsupported material setting %s", key)
if not hotend_compatibility:
continue
new_hotend_material = XmlMaterialProfile(self.id + "_" + machine_id + "_" + hotend_id.replace(" ", "_"))
new_hotend_material.setName(self.getName())
new_hotend_material.setMetaData(copy.deepcopy(self.getMetaData()))
new_hotend_material.setDefinition(definition)
new_hotend_material.addMetaDataEntry("variant", variant_containers[0].id)
new_hotend_material.addMetaDataEntry("compatible", hotend_compatibility)
for key, value in global_setting_values.items():
new_hotend_material.setProperty(key, "value", value, definition)
@ -507,7 +505,9 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
# Change the type of this container so it is not shown as an option in menus.
# This uses InstanceContainer.setMetaDataEntry because otherwise all containers that
# share this basefile are also updated.
dirty = self.isDirty()
super().setMetaDataEntry("type", "incompatible_material")
super().setDirty(dirty) # reset dirty flag after setMetaDataEntry
def _addSettingElement(self, builder, instance):
try: