GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 15:19:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13544 from Ultimaker/CURA-9689_filter_config_list

Browse Source 
[CURA-9689] Filter material lists for compatible printers.
This commit is contained in:
Casper Lamboo 2022-10-12 13:57:55 +02:00 committed by GitHub
commit a5445111a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cura/Machines/Models/CompatibleMachineModel.py
View File

@ -38,6 +38,12 @@ class CompatibleMachineModel(ListModel):
def _update(self) -> None: def _update(self) -> None:
self.clear() self.clear()
def _makeMaterial(brand, name, color):
if name.lower() in ["", "empty"]:
return {"brand": "", "name": "(empty)", "hexcolor": "#ffffff"}
else:
return {"brand": brand, "name": name, "hexcolor": color}
from cura.CuraApplication import CuraApplication from cura.CuraApplication import CuraApplication
machine_manager = CuraApplication.getInstance().getMachineManager() machine_manager = CuraApplication.getInstance().getMachineManager()
@ -48,11 +54,8 @@ class CompatibleMachineModel(ListModel):
# initialize & add current active material: # initialize & add current active material:
for extruder in printer.extruders: for extruder in printer.extruders:
materials = [{ materials = [_makeMaterial(
"brand": extruder.activeMaterial.brand, extruder.activeMaterial.brand, extruder.activeMaterial.name, extruder.activeMaterial.color)]
"name": extruder.activeMaterial.name,
"hexcolor": extruder.activeMaterial.color,
}]
extruder_configs[extruder.getPosition()] = { extruder_configs[extruder.getPosition()] = {
"position": extruder.getPosition(), "position": extruder.getPosition(),
"core": extruder.hotendID, "core": extruder.hotendID,
@ -66,11 +69,9 @@ class CompatibleMachineModel(ListModel):
Logger.log("w", f"No active extruder for position {extruder.position}.") Logger.log("w", f"No active extruder for position {extruder.position}.")
continue continue
extruder_configs[extruder.position]["materials"].append({ entry = _makeMaterial(extruder.material.brand, extruder.material.name, extruder.material.color)
"brand": extruder.material.brand, if entry not in extruder_configs[extruder.position]["materials"]:
"name": extruder.material.name, extruder_configs[extruder.position]["materials"].append(entry)
"hexcolor": extruder.material.color
})
if any([len(extruder["materials"]) > 0 for extruder in extruder_configs.values()]): if any([len(extruder["materials"]) > 0 for extruder in extruder_configs.values()]):
self.appendItem({ self.appendItem({