3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 22:54:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Group printers by section (Connected Printers/Other Printers)

Browse source 
Cleanup redundant code.

CURA-9514
This commit is contained in:
joeydelarago 2022-08-23 15:44:16 +02:00
parent b18080c332
commit 93e2bef303
4 changed files with 35 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,14 +2,12 @@
# Cura is released under the terms of the LGPLv3 or higher.
from PyQt6.QtCore import Qt, QTimer
from typing import Optional, Dict
from UM.Qt.ListModel import ListModel
from UM.Settings.ContainerStack import ContainerStack
from UM.i18n import i18nCatalog
from UM.Util import parseBool
from cura.PrinterOutput.PrinterOutputDevice import ConnectionType
from cura.Settings.AbstractMachine import AbstractMachine
from cura.Settings.CuraContainerRegistry import CuraContainerRegistry
from cura.Settings.GlobalStack import GlobalStack
@ -19,13 +17,10 @@ class MachineListModel(ListModel):
NameRole = Qt.ItemDataRole.UserRole + 1
IdRole = Qt.ItemDataRole.UserRole + 2
HasRemoteConnectionRole = Qt.ItemDataRole.UserRole + 3
ConnectionTypeRole = Qt.ItemDataRole.UserRole + 4
MetaDataRole = Qt.ItemDataRole.UserRole + 5
DiscoverySourceRole = Qt.ItemDataRole.UserRole + 6
RemovalWarningRole = Qt.ItemDataRole.UserRole + 7
IsOnlineRole = Qt.ItemDataRole.UserRole + 8
MachineTypeRole = Qt.ItemDataRole.UserRole + 9
MachineCountRole = Qt.ItemDataRole.UserRole + 10
MetaDataRole = Qt.ItemDataRole.UserRole + 4
IsOnlineRole = Qt.ItemDataRole.UserRole + 5
MachineTypeRole = Qt.ItemDataRole.UserRole + 6
MachineCountRole = Qt.ItemDataRole.UserRole + 7
def __init__(self, parent=None) -> None:
super().__init__(parent)
@ -36,7 +31,6 @@ class MachineListModel(ListModel):
self.addRoleName(self.IdRole, "id")
self.addRoleName(self.HasRemoteConnectionRole, "hasRemoteConnection")
self.addRoleName(self.MetaDataRole, "metadata")
self.addRoleName(self.DiscoverySourceRole, "discoverySource")
self.addRoleName(self.IsOnlineRole, "isOnline")
self.addRoleName(self.MachineTypeRole, "machineType")
self.addRoleName(self.MachineCountRole, "machineCount")
@ -63,50 +57,37 @@ class MachineListModel(ListModel):
self._change_timer.start()
def _update(self) -> None:
items = []
self.setItems([]) # Clear items
abstract_machine_stacks = CuraContainerRegistry.getInstance().findContainerStacks(type="abstract_machine")
abstract_machine_stacks.sort(key=lambda machine: machine.getName(), reverse=True)
abstract_machine_stacks = CuraContainerRegistry.getInstance().findContainerStacks(type = "abstract_machine")
abstract_machine_stacks.sort(key = lambda machine: machine.getName(), reverse = True)
for abstract_machine in abstract_machine_stacks:
machine_stacks = AbstractMachine.getMachines(abstract_machine)
online_machine_stacks = AbstractMachine.getMachines(abstract_machine, online_only = True)
# Create item for abstract printer
items.append(self.createItem(abstract_machine, len(machine_stacks)))
self.addItem(abstract_machine, len(online_machine_stacks))
# Create list of printers that are children of the abstract printer
for stack in machine_stacks:
item = self.createItem(stack)
if item:
items.append(item)
for stack in online_machine_stacks:
self.addItem(stack)
self.setItems(items)
offline_machine_stacks = CuraContainerRegistry.getInstance().findContainerStacks(type = "machine", is_online = "False")
for stack in offline_machine_stacks:
self.addItem(stack)
def createItem(self, container_stack: ContainerStack, machine_count: int = 0) -> Optional[Dict]:
def addItem(self, container_stack: ContainerStack, machine_count: int = 0) -> None:
if parseBool(container_stack.getMetaDataEntry("hidden", False)):
return
has_remote_connection = False
isOnline = parseBool(container_stack.getMetaDataEntry("is_online", False))
if container_stack.getMetaDataEntry("type") == "abstract_machine":
isOnline = True
for connection_type in container_stack.configuredConnectionTypes:
has_remote_connection |= connection_type in [ConnectionType.NetworkConnection.value,
ConnectionType.CloudConnection.value]
device_name = container_stack.getMetaDataEntry("group_name", container_stack.getName())
default_removal_warning = self._catalog.i18nc(
"@label {0} is the name of a printer that's about to be deleted.",
"Are you sure you wish to remove {0}? This cannot be undone!", device_name
)
return {"name": device_name,
"id": container_stack.getId(),
"hasRemoteConnection": has_remote_connection,
"metadata": container_stack.getMetaData().copy(),
"section": self._catalog.i18nc("@label", "Connected printers"),
"removalWarning": container_stack.getMetaDataEntry("removal_warning", default_removal_warning),
"isOnline": container_stack.getMetaDataEntry("is_online", False),
"machineType": container_stack.getMetaDataEntry("type"),
"machineCount": machine_count,
}
self.appendItem({"name": container_stack.getName(),
"id": container_stack.getId(),
"metadata": container_stack.getMetaData().copy(),
"isOnline": isOnline,
"machineType": container_stack.getMetaDataEntry("type"),
"machineCount": machine_count,
})