mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-10 00:07:51 -06:00
Properly display the full type + brand of unknown material
CURA-6033
This commit is contained in:
parent
c08339e191
commit
a16e406507
2 changed files with 16 additions and 3 deletions
|
@ -620,8 +620,9 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
|
||||||
if material_group_list is None:
|
if material_group_list is None:
|
||||||
material_name = i18n_catalog.i18nc("@label:material", "Empty") if len(material_data.get("guid", "")) == 0 \
|
material_name = i18n_catalog.i18nc("@label:material", "Empty") if len(material_data.get("guid", "")) == 0 \
|
||||||
else i18n_catalog.i18nc("@label:material", "Unknown")
|
else i18n_catalog.i18nc("@label:material", "Unknown")
|
||||||
|
|
||||||
return MaterialOutputModel(guid = material_data.get("guid", ""),
|
return MaterialOutputModel(guid = material_data.get("guid", ""),
|
||||||
type = material_data.get("type", ""),
|
type = material_data.get("material", ""),
|
||||||
color = material_data.get("color", ""),
|
color = material_data.get("color", ""),
|
||||||
brand = material_data.get("brand", ""),
|
brand = material_data.get("brand", ""),
|
||||||
name = material_data.get("name", material_name)
|
name = material_data.get("name", material_name)
|
||||||
|
|
|
@ -105,10 +105,22 @@ Button
|
||||||
for (var index in extruderConfigurations)
|
for (var index in extruderConfigurations)
|
||||||
{
|
{
|
||||||
var name = extruderConfigurations[index].material ? extruderConfigurations[index].material.name : ""
|
var name = extruderConfigurations[index].material ? extruderConfigurations[index].material.name : ""
|
||||||
|
|
||||||
if (name == "" || name == "Unknown")
|
if (name == "" || name == "Unknown")
|
||||||
{
|
{
|
||||||
unknownMaterials.push(extruderConfigurations[index].material.brand ? extruderConfigurations[index].material.brand : "Unknown Brand")
|
var materialType = extruderConfigurations[index].material.type
|
||||||
|
if (extruderConfigurations[index].material.type == "")
|
||||||
|
{
|
||||||
|
materialType = "Unknown"
|
||||||
|
}
|
||||||
|
|
||||||
|
var brand = extruderConfigurations[index].material.brand
|
||||||
|
if (brand == "")
|
||||||
|
{
|
||||||
|
brand = "Unknown"
|
||||||
|
}
|
||||||
|
|
||||||
|
name = materialType + " (" + brand + ")"
|
||||||
|
unknownMaterials.push(name)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue