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

Make sure online printers are always shown in the correct tab

Browse source 
CURA-9277
This commit is contained in:
c.lamboo 2022-09-05 11:44:29 +02:00
parent ce6d7d72bd
commit 48b8585ce6
1 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -89,17 +89,27 @@ class MachineListModel(ListModel):
machines_manager = CuraApplication.getInstance().getMachineManager() machines_manager = CuraApplication.getInstance().getMachineManager()
online_machine_stacks = machines_manager.getMachinesWithDefinition(definition_id, online_only = True) online_machine_stacks = machines_manager.getMachinesWithDefinition(definition_id, online_only = True)
def online_machines_has_connection_filter(machine_stack):
# This is required because machines loaded from projects have the is_online="True" but no connection type.
# We want to display them the same way as unconnected printers in this case.
has_connection = False
for connection_type in [ConnectionType.NetworkConnection.value, ConnectionType.CloudConnection.value]:
has_connection |= connection_type in machine_stack.configuredConnectionTypes
return has_connection
online_machine_stacks = list(filter(online_machines_has_connection_filter, online_machine_stacks))
other_machine_stacks.remove(abstract_machine) other_machine_stacks.remove(abstract_machine)
if abstract_machine in online_machine_stacks: if abstract_machine in online_machine_stacks:
online_machine_stacks.remove(abstract_machine) online_machine_stacks.remove(abstract_machine)
# Create a list item for abstract machine # Create a list item for abstract machine
self.addItem(abstract_machine, len(online_machine_stacks)) self.addItem(abstract_machine, True, len(online_machine_stacks))
# Create list of machines that are children of the abstract machine # Create list of machines that are children of the abstract machine
for stack in online_machine_stacks: for stack in online_machine_stacks:
if self._show_cloud_printers: if self._show_cloud_printers:
self.addItem(stack) self.addItem(stack, True)
# Remove this machine from the other stack list # Remove this machine from the other stack list
if stack in other_machine_stacks: if stack in other_machine_stacks:
other_machine_stacks.remove(stack) other_machine_stacks.remove(stack)
@ -119,25 +129,18 @@ class MachineListModel(ListModel):
}) })
for stack in other_machine_stacks: for stack in other_machine_stacks:
self.addItem(stack) self.addItem(stack, False)
def addItem(self, container_stack: ContainerStack, machine_count: int = 0) -> None: def addItem(self, container_stack: ContainerStack, is_online, machine_count: int = 0) -> None:
if parseBool(container_stack.getMetaDataEntry("hidden", False)): if parseBool(container_stack.getMetaDataEntry("hidden", False)):
return return
# This is required because machines loaded from projects have the is_online="True" but no connection type.
# We want to display them the same way as unconnected printers in this case.
has_connection = False
has_connection |= parseBool(container_stack.getMetaDataEntry("is_abstract_machine", False))
for connection_type in [ConnectionType.NetworkConnection.value, ConnectionType.CloudConnection.value]:
has_connection |= connection_type in container_stack.configuredConnectionTypes
self.appendItem({ self.appendItem({
"componentType": "MACHINE", "componentType": "MACHINE",
"name": container_stack.getName(), "name": container_stack.getName(),
"id": container_stack.getId(), "id": container_stack.getId(),
"metadata": container_stack.getMetaData().copy(), "metadata": container_stack.getMetaData().copy(),
"isOnline": parseBool(container_stack.getMetaDataEntry("is_online", False)) and has_connection, "isOnline": is_online,
"isAbstractMachine": parseBool(container_stack.getMetaDataEntry("is_abstract_machine", False)), "isAbstractMachine": parseBool(container_stack.getMetaDataEntry("is_abstract_machine", False)),
"machineCount": machine_count, "machineCount": machine_count,
}) })