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

Use "NotConnected" as default for the connection state

Browse source 
CURA-6011
This commit is contained in:
Jaime van Kessel 2018-12-31 11:25:23 +01:00
parent 89040b6d8f
commit d9d1c93bd0
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/GlobalStacksModel.py
View file

@ -48,7 +48,7 @@ class GlobalStacksModel(ListModel):
container_stacks = ContainerRegistry.getInstance().findContainerStacks(type = "machine") container_stacks = ContainerRegistry.getInstance().findContainerStacks(type = "machine")
for container_stack in container_stacks: for container_stack in container_stacks:
connection_type = int(container_stack.getMetaDataEntry("connection_type", "-1")) connection_type = int(container_stack.getMetaDataEntry("connection_type", ConnectionType.NotConnected.value))
has_remote_connection = connection_type in [ConnectionType.NetworkConnection.value, ConnectionType.CloudConnection.value] has_remote_connection = connection_type in [ConnectionType.NetworkConnection.value, ConnectionType.CloudConnection.value]
if container_stack.getMetaDataEntry("hidden", False) in ["True", True]: if container_stack.getMetaDataEntry("hidden", False) in ["True", True]:
continue continue

4
cura/PrinterOutputDevice.py
View file

@ -36,7 +36,7 @@ class ConnectionState(IntEnum):
class ConnectionType(IntEnum): class ConnectionType(IntEnum):
Unknown = 0 NotConnected = 0
UsbConnection = 1 UsbConnection = 1
NetworkConnection = 2 NetworkConnection = 2
CloudConnection = 3 CloudConnection = 3
@ -74,7 +74,7 @@ class PrinterOutputDevice(QObject, OutputDevice):
# Signal to indicate that the configuration of one of the printers has changed. # Signal to indicate that the configuration of one of the printers has changed.
uniqueConfigurationsChanged = pyqtSignal() uniqueConfigurationsChanged = pyqtSignal()
def __init__(self, device_id: str, connection_type: "ConnectionType" = ConnectionType.Unknown, parent: QObject = None) -> None: def __init__(self, device_id: str, connection_type: "ConnectionType" = ConnectionType.NotConnected, parent: QObject = None) -> None:
super().__init__(device_id = device_id, parent = parent) # type: ignore # MyPy complains with the multiple inheritance super().__init__(device_id = device_id, parent = parent) # type: ignore # MyPy complains with the multiple inheritance
self._printers = [] # type: List[PrinterOutputModel] self._printers = [] # type: List[PrinterOutputModel]

2
cura/Settings/MachineManager.py
View file

@ -527,7 +527,7 @@ class MachineManager(QObject):
@pyqtProperty(bool, notify = printerConnectedStatusChanged) @pyqtProperty(bool, notify = printerConnectedStatusChanged)
def activeMachineHasRemoteConnection(self) -> bool: def activeMachineHasRemoteConnection(self) -> bool:
if self._global_container_stack: if self._global_container_stack:
connection_type = int(self._global_container_stack.getMetaDataEntry("connection_type", "-1")) connection_type = int(self._global_container_stack.getMetaDataEntry("connection_type", ConnectionType.NotConnected.value))
return connection_type in [ConnectionType.NetworkConnection.value, ConnectionType.CloudConnection.value] return connection_type in [ConnectionType.NetworkConnection.value, ConnectionType.CloudConnection.value]
return False return False