3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-23 02:41:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge branch '3.4'

Browse source
This commit is contained in:
Ghostkeeper 2018-06-07 11:38:13 +02:00
commit 8202b62343
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
4 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
plugins/3MFReader/ThreeMFWorkspaceReader.py
View file

@ -606,9 +606,10 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
machine_name = self._container_registry.uniqueName(self._machine_info.name)
global_stack = CuraStackBuilder.createMachine(machine_name, self._machine_info.definition_id)
extruder_stack_dict = global_stack.extruders
if global_stack: #Only switch if creating the machine was successful.
extruder_stack_dict = global_stack.extruders
self._container_registry.addContainer(global_stack)
self._container_registry.addContainer(global_stack)
else:
# Find the machine
global_stack = self._container_registry.findContainerStacks(name = self._machine_info.name, type = "machine")[0]

16
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View file

@ -518,9 +518,10 @@ class XmlMaterialProfile(InstanceContainer):
meta_data["name"] = label.text
else:
meta_data["name"] = self._profile_name(material.text, color.text)
meta_data["brand"] = brand.text
meta_data["material"] = material.text
meta_data["color_name"] = color.text
meta_data["brand"] = brand.text if brand.text is not None else "Unknown Brand"
meta_data["material"] = material.text if material.text is not None else "Unknown Type"
meta_data["color_name"] = color.text if color.text is not None else "Unknown Color"
continue
# setting_version is derived from the "version" tag in the schema earlier, so don't set it here
@ -811,9 +812,10 @@ class XmlMaterialProfile(InstanceContainer):
base_metadata["name"] = label.text
else:
base_metadata["name"] = cls._profile_name(material.text, color.text)
base_metadata["brand"] = brand.text
base_metadata["material"] = material.text
base_metadata["color_name"] = color.text
base_metadata["brand"] = brand.text if brand.text is not None else "Unknown Brand"
base_metadata["material"] = material.text if material.text is not None else "Unknown Type"
base_metadata["color_name"] = color.text if color.text is not None else "Unknown Color"
continue
#Setting_version is derived from the "version" tag in the schema earlier, so don't set it here.
@ -976,6 +978,8 @@ class XmlMaterialProfile(InstanceContainer):
@classmethod
def _profile_name(cls, material_name, color_name):
if material_name is None:
return "Unknown Material"
if color_name != "Generic":
return "%s %s" % (color_name, material_name)
else: