3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-21 05:37:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Subtract online printers from list of all printers instead of searching for offline printers.

Browse source 
This prevents printers without "is_online" in the metadata from being left out, and is generally more defensive for uncertain states.

CURA-9514
This commit is contained in:
joeydelarago 2022-08-24 10:09:45 +02:00
parent 17e6bccf51
commit 91b8c97dae
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
cura/Machines/Models/MachineListModel.py
View file

@ -59,21 +59,28 @@ class MachineListModel(ListModel):
def _update(self) -> None: def _update(self) -> None:
self.setItems([]) # Clear items self.setItems([]) # Clear items
other_machine_stacks = CuraContainerRegistry.getInstance().findContainerStacks(type="machine")
abstract_machine_stacks = CuraContainerRegistry.getInstance().findContainerStacks(type = "abstract_machine") abstract_machine_stacks = CuraContainerRegistry.getInstance().findContainerStacks(type = "abstract_machine")
abstract_machine_stacks.sort(key = lambda machine: machine.getName(), reverse = True) abstract_machine_stacks.sort(key = lambda machine: machine.getName(), reverse = True)
for abstract_machine in abstract_machine_stacks: for abstract_machine in abstract_machine_stacks:
online_machine_stacks = AbstractMachine.getMachines(abstract_machine, online_only = True) online_machine_stacks = AbstractMachine.getMachines(abstract_machine, online_only = True)
# Create item for abstract printer # Create a list item for abstract machine
self.addItem(abstract_machine, len(online_machine_stacks)) self.addItem(abstract_machine, len(online_machine_stacks))
# Create list of printers that are children of the abstract printer # Create list of machines that are children of the abstract machine
for stack in online_machine_stacks: for stack in online_machine_stacks:
self.addItem(stack) self.addItem(stack)
# Remove this machine from the other stack list
other_machine_stacks.remove(stack)
offline_machine_stacks = CuraContainerRegistry.getInstance().findContainerStacks(type = "machine", is_online = "False")
for stack in offline_machine_stacks: # Filtering must be done like this because searching with findContainerStacks(is_online = "True") does not return
# stacks that don't have is_online in their metadata. We still want to show these printers.
# offline_machine_stacks = [stack for stack in offline_machine_stacks if parseBool(stack.getMetaDataEntry("is_online", False))]
for stack in other_machine_stacks:
self.addItem(stack) self.addItem(stack)
def addItem(self, container_stack: ContainerStack, machine_count: int = 0) -> None: def addItem(self, container_stack: ContainerStack, machine_count: int = 0) -> None: