3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-08 07:27:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Don't cache application instance

Browse source
This commit is contained in:
ChrisTerBeke 2019-07-29 17:34:31 +02:00
parent 93146610f7
commit 14808c5de1
1 changed files with 8 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -39,11 +39,7 @@ class CloudOutputDeviceManager:
def __init__(self) -> None: def __init__(self) -> None:
# Persistent dict containing the remote clusters for the authenticated user. # Persistent dict containing the remote clusters for the authenticated user.
self._remote_clusters = {} # type: Dict[str, CloudOutputDevice] self._remote_clusters = {} # type: Dict[str, CloudOutputDevice]
self._account = CuraApplication.getInstance().getCuraAPI().account # type: Account
self._application = CuraApplication.getInstance()
self._output_device_manager = self._application.getOutputDeviceManager()
self._account = self._application.getCuraAPI().account # type: Account
self._api = CloudApiClient(self._account, self._onApiError) self._api = CloudApiClient(self._account, self._onApiError)
# Create a timer to update the remote cluster list # Create a timer to update the remote cluster list
@ -58,8 +54,6 @@ class CloudOutputDeviceManager:
if self._running: if self._running:
return return
self._account.loginStateChanged.connect(self._onLoginStateChanged) self._account.loginStateChanged.connect(self._onLoginStateChanged)
# When switching machines we check if we have to activate a remote cluster.
self._application.globalContainerStackChanged.connect(self._connectToActiveMachine)
self._update_timer.timeout.connect(self._getRemoteClusters) self._update_timer.timeout.connect(self._getRemoteClusters)
self._onLoginStateChanged(is_logged_in = self._account.isLoggedIn) self._onLoginStateChanged(is_logged_in = self._account.isLoggedIn)
@ -68,8 +62,6 @@ class CloudOutputDeviceManager:
if not self._running: if not self._running:
return return
self._account.loginStateChanged.disconnect(self._onLoginStateChanged) self._account.loginStateChanged.disconnect(self._onLoginStateChanged)
# When switching machines we check if we have to activate a remote cluster.
self._application.globalContainerStackChanged.disconnect(self._connectToActiveMachine)
self._update_timer.timeout.disconnect(self._getRemoteClusters) self._update_timer.timeout.disconnect(self._getRemoteClusters)
self._onLoginStateChanged(is_logged_in = False) self._onLoginStateChanged(is_logged_in = False)
@ -104,8 +96,8 @@ class CloudOutputDeviceManager:
if device.isConnected(): if device.isConnected():
device.disconnect() device.disconnect()
device.close() device.close()
self._output_device_manager.removeOutputDevice(device.key) CuraApplication.getInstance().getOutputDeviceManager().removeOutputDevice(device.key)
self._application.getDiscoveredPrintersModel().removeDiscoveredPrinter(device.key) CuraApplication.getInstance().getDiscoveredPrintersModel().removeDiscoveredPrinter(device.key)
self.removedCloudCluster.emit(device) self.removedCloudCluster.emit(device)
del self._remote_clusters[device.key] del self._remote_clusters[device.key]
@ -114,7 +106,7 @@ class CloudOutputDeviceManager:
for cluster in added_clusters: for cluster in added_clusters:
device = CloudOutputDevice(self._api, cluster) device = CloudOutputDevice(self._api, cluster)
self._remote_clusters[cluster.cluster_id] = device self._remote_clusters[cluster.cluster_id] = device
self._application.getDiscoveredPrintersModel().addDiscoveredPrinter( CuraApplication.getInstance().getDiscoveredPrintersModel().addDiscoveredPrinter(
device.key, device.key,
device.key, device.key,
cluster.friendly_name, cluster.friendly_name,
@ -127,7 +119,7 @@ class CloudOutputDeviceManager:
# Update the output devices # Update the output devices
for device, cluster in updates: for device, cluster in updates:
device.clusterData = cluster device.clusterData = cluster
self._application.getDiscoveredPrintersModel().updateDiscoveredPrinter( CuraApplication.getInstance().getDiscoveredPrintersModel().updateDiscoveredPrinter(
device.key, device.key,
cluster.friendly_name, cluster.friendly_name,
device.printerType, device.printerType,
@ -148,7 +140,7 @@ class CloudOutputDeviceManager:
key, group_name, machine_type_id) key, group_name, machine_type_id)
# The newly added machine is automatically activated. # The newly added machine is automatically activated.
self._application.getMachineManager().addMachine(machine_type_id, group_name) CuraApplication.getInstance().getMachineManager().addMachine(machine_type_id, group_name)
self._connectToActiveMachine() self._connectToActiveMachine()
## Callback for when the active machine was changed by the user or a new remote cluster was found. ## Callback for when the active machine was changed by the user or a new remote cluster was found.
@ -161,7 +153,7 @@ class CloudOutputDeviceManager:
# This is needed because when we switch machines we can only leave # This is needed because when we switch machines we can only leave
# output devices that are meant for that machine. # output devices that are meant for that machine.
for stored_cluster_id in self._remote_clusters: for stored_cluster_id in self._remote_clusters:
self._output_device_manager.removeOutputDevice(stored_cluster_id) CuraApplication.getInstance().getOutputDeviceManager().removeOutputDevice(stored_cluster_id)
# Check if the stored cluster_id for the active machine is in our list of remote clusters. # Check if the stored cluster_id for the active machine is in our list of remote clusters.
stored_cluster_id = active_machine.getMetaDataEntry(self.META_CLUSTER_ID) stored_cluster_id = active_machine.getMetaDataEntry(self.META_CLUSTER_ID)
@ -192,7 +184,7 @@ class CloudOutputDeviceManager:
device.connect() device.connect()
active_machine.setMetaDataEntry(self.META_CLUSTER_ID, device.key) active_machine.setMetaDataEntry(self.META_CLUSTER_ID, device.key)
active_machine.addConfiguredConnectionType(device.connectionType.value) active_machine.addConfiguredConnectionType(device.connectionType.value)
self._output_device_manager.addOutputDevice(device) CuraApplication.getInstance().getOutputDeviceManager().addOutputDevice(device)
## Handles an API error received from the cloud. ## Handles an API error received from the cloud.
# \param errors: The errors received # \param errors: The errors received