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

Move hasNetworkedConnection to GlobalStack

Browse source 
From code review

CURA-9277
Co-authored-by: Joey <j.delarago@ultimaker.com>
This commit is contained in:
c.lamboo 2022-09-06 13:52:10 +02:00
parent 6253fb2fdc
commit 148263a068
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -89,15 +89,7 @@ class MachineListModel(ListModel):
machines_manager = CuraApplication.getInstance().getMachineManager()
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))
online_machine_stacks = list(filter(lambda machine: machine.hasNetworkedConnection(), online_machine_stacks))
other_machine_stacks.remove(abstract_machine)
if abstract_machine in online_machine_stacks:

6
cura/Settings/GlobalStack.py
View file

@ -347,6 +347,12 @@ class GlobalStack(CuraContainerStack):
nameChanged = pyqtSignal()
name = pyqtProperty(str, fget=getName, fset=setName, notify=nameChanged)
def hasNetworkedConnection(self) -> bool:
has_connection = False
for connection_type in [ConnectionType.NetworkConnection.value, ConnectionType.CloudConnection.value]:
has_connection |= connection_type in self.configuredConnectionTypes
return has_connection
## private:
global_stack_mime = MimeType(
name = "application/x-cura-globalstack",