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

Do no stop when no clusters are found, we still might need to remove some

Browse source
This commit is contained in:
ChrisTerBeke 2018-12-04 22:58:50 +01:00
parent d0513e40e1
commit b57f6c5c6a
No known key found for this signature in database
GPG key ID: A49F1AB9D7E0C263
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py
View file

@ -63,8 +63,6 @@ class CloudOutputDeviceManager:
found_clusters = {c.cluster_id: c for c in clusters} found_clusters = {c.cluster_id: c for c in clusters}
Logger.log("i", "Parsed remote clusters to %s", found_clusters) Logger.log("i", "Parsed remote clusters to %s", found_clusters)
if not found_clusters:
return
known_cluster_ids = set(self._remote_clusters.keys()) known_cluster_ids = set(self._remote_clusters.keys())
found_cluster_ids = set(found_clusters.keys()) found_cluster_ids = set(found_clusters.keys())
@ -85,7 +83,6 @@ class CloudOutputDeviceManager:
device = CloudOutputDevice(self._api, cluster.cluster_id) device = CloudOutputDevice(self._api, cluster.cluster_id)
self._output_device_manager.addOutputDevice(device) self._output_device_manager.addOutputDevice(device)
self._remote_clusters[cluster.cluster_id] = device self._remote_clusters[cluster.cluster_id] = device
device.connect() # TODO: remove this
self._connectToActiveMachine(cluster.cluster_id) self._connectToActiveMachine(cluster.cluster_id)
## Remove a CloudOutputDevice ## Remove a CloudOutputDevice
@ -95,13 +92,14 @@ class CloudOutputDeviceManager:
if cluster.cluster_id in self._remote_clusters: if cluster.cluster_id in self._remote_clusters:
del self._remote_clusters[cluster.cluster_id] del self._remote_clusters[cluster.cluster_id]
## Callback for when the active machine was changed by the user. ## Callback for when the active machine was changed by the user or a new remote cluster was found.
def _connectToActiveMachine(self, cluster_id: Optional[str] = None) -> None: def _connectToActiveMachine(self, cluster_id: Optional[str] = None) -> None:
active_machine = CuraApplication.getInstance().getGlobalContainerStack() active_machine = CuraApplication.getInstance().getGlobalContainerStack()
if not active_machine: if not active_machine:
return return
# TODO: Remove this once correct pairing has been added (see below). # TODO: Remove this once correct pairing has been added (see below).
# TODO: This just adds any available cluster to the active device for testing.
if cluster_id: if cluster_id:
active_machine.setMetaDataEntry("um_cloud_cluster_id", cluster_id) active_machine.setMetaDataEntry("um_cloud_cluster_id", cluster_id)