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

Don't show machines with only incompatible configurations.

Browse source 
part of CURA-9278
This commit is contained in:
Remco Burema 2022-09-09 13:17:41 +02:00
parent 6adf05bbf0
commit 2b1909b7b5
1 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cura/Machines/Models/CompatibleMachineModel.py
View file

@ -36,14 +36,17 @@ class CompatibleMachineModel(ListModel):
from cura.CuraApplication import CuraApplication from cura.CuraApplication import CuraApplication
machine_manager = CuraApplication.getInstance().getMachineManager() machine_manager = CuraApplication.getInstance().getMachineManager()
# Need to loop over the output-devices, not the stacks, since we need all applicable configurations, not just the current loaded one. # Loop over the output-devices, not the stacks; need all applicable configurations, not just the current loaded one.
for output_device in machine_manager.printerOutputDevices: for output_device in machine_manager.printerOutputDevices:
for printer in output_device.printers: for printer in output_device.printers:
extruder_configs = dict() extruder_configs = dict()
# initialize & add current active material: # initialize & add current active material:
for extruder in printer.extruders: for extruder in printer.extruders:
materials = [] if not extruder.activeMaterial else [{ compatible_type = machine_manager.activeMachine.extruderList[extruder.getPosition()].material.getMetaDataEntry("material", "")
has_compatible_material = extruder.activeMaterial and compatible_type in [extruder.activeMaterial.type, None, "None", "", "empty"]
materials = [] if not has_compatible_material else [{
"brand": extruder.activeMaterial.brand, "brand": extruder.activeMaterial.brand,
"name": extruder.activeMaterial.name, "name": extruder.activeMaterial.name,
"hexcolor": extruder.activeMaterial.color "hexcolor": extruder.activeMaterial.color
@ -57,6 +60,9 @@ class CompatibleMachineModel(ListModel):
# add currently inactive, but possible materials: # add currently inactive, but possible materials:
for configuration in printer.availableConfigurations: for configuration in printer.availableConfigurations:
for extruder in configuration.extruderConfigurations: for extruder in configuration.extruderConfigurations:
compatible_type = machine_manager.activeMachine.extruderList[extruder.position].material.getMetaDataEntry("material", "")
if compatible_type not in [extruder.material.type, None, "None", "", "empty"]:
continue
if not extruder.position in extruder_configs: if not extruder.position in extruder_configs:
Logger.log("w", f"No active extruder for position {extruder.position}.") Logger.log("w", f"No active extruder for position {extruder.position}.")
@ -68,6 +74,7 @@ class CompatibleMachineModel(ListModel):
"hexcolor": extruder.material.color "hexcolor": extruder.material.color
}) })
if all([len(extruder["materials"]) > 0 for extruder in extruder_configs.values()]):
self.appendItem({ self.appendItem({
"name": printer.name, "name": printer.name,
"unique_id": printer.uniqueName, "unique_id": printer.uniqueName,