diff options
| author | c.lamboo <casperlamboo@gmail.com> | 2022-09-13 11:34:33 +0300 |
|---|---|---|
| committer | c.lamboo <casperlamboo@gmail.com> | 2022-09-13 11:34:33 +0300 |
| commit | ad14e60d26c7dbcfe701ba3485921d1ce3a1cc8b (patch) | |
| tree | 9e8f051cf26e5c4881e570d1fc8bef827b1e1732 /cura/Machines | |
| parent | 8935ab4a2da8fe134e1b821ac77640b89ef8b34f (diff) | |
Show printer even if the configuration does not match
CURA-9278
Diffstat (limited to 'cura/Machines')
| -rw-r--r-- | cura/Machines/Models/CompatibleMachineModel.py | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/cura/Machines/Models/CompatibleMachineModel.py b/cura/Machines/Models/CompatibleMachineModel.py index ed1f508ad0..029567cdec 100644 --- a/cura/Machines/Models/CompatibleMachineModel.py +++ b/cura/Machines/Models/CompatibleMachineModel.py @@ -44,19 +44,11 @@ class CompatibleMachineModel(ListModel): # initialize & add current active material: for extruder in printer.extruders: - if extruder.getPosition() in machine_manager.activeMachine.extruderList: - compatible_type = machine_manager.activeMachine.extruderList[extruder.getPosition()].material.getMetaDataEntry("material", "") - else: - compatible_type = "" - has_compatible_material = extruder.activeMaterial and compatible_type in [extruder.activeMaterial.type, None, "None", "", "empty"] - - materials = [] - if has_compatible_material: - materials.append({ - "brand": extruder.activeMaterial.brand, - "name": extruder.activeMaterial.name, - "hexcolor": extruder.activeMaterial.color, - }) + materials = [{ + "brand": extruder.activeMaterial.brand, + "name": extruder.activeMaterial.name, + "hexcolor": extruder.activeMaterial.color, + }] extruder_configs[extruder.getPosition()] = { "position": extruder.getPosition(), "core": extruder.hotendID, @@ -66,13 +58,6 @@ class CompatibleMachineModel(ListModel): # add currently inactive, but possible materials: for configuration in printer.availableConfigurations: for extruder in configuration.extruderConfigurations: - if extruder.position in machine_manager.activeMachine.extruderList: - compatible_type = machine_manager.activeMachine.extruderList[extruder.position].material.getMetaDataEntry("material", "") - else: - compatible_type = "" - if compatible_type not in [extruder.material.type, None, "None", "", "empty"]: - continue - if not extruder.position in extruder_configs: Logger.log("w", f"No active extruder for position {extruder.position}.") continue |