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

CL-460 use name instead of object to cluster_printers_seen

Browse source
This commit is contained in:
Jack Ha 2017-09-29 13:58:14 +02:00
parent 10fab716d5
commit 67d730c851
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/UM3NetworkPrinting/NetworkPrinterOutputDevicePlugin.py
View file

@ -31,7 +31,7 @@ class NetworkPrinterOutputDevicePlugin(QObject, OutputDevicePlugin):
self._zero_conf = None self._zero_conf = None
self._browser = None self._browser = None
self._printers = {} self._printers = {}
self._printers_seen = {} # do not forget a printer when we have seen one, also do not 'downgrade' to legacy printer from Connect self._cluster_printers_seen = {} # do not forget a cluster printer when we have seen one, to not 'downgrade' from Connect to legacy printer
self._api_version = "1" self._api_version = "1"
self._api_prefix = "/api/v" + self._api_version + "/" self._api_prefix = "/api/v" + self._api_version + "/"
@ -219,7 +219,7 @@ class NetworkPrinterOutputDevicePlugin(QObject, OutputDevicePlugin):
## Because the model needs to be created in the same thread as the QMLEngine, we use a signal. ## Because the model needs to be created in the same thread as the QMLEngine, we use a signal.
def addPrinter(self, name, address, properties, force_cluster=False): def addPrinter(self, name, address, properties, force_cluster=False):
cluster_size = int(properties.get(b"cluster_size", -1)) cluster_size = int(properties.get(b"cluster_size", -1))
was_cluster_before = isinstance(self._printers_seen.get(name, None), NetworkClusterPrinterOutputDevice.NetworkClusterPrinterOutputDevice) was_cluster_before = name in self._cluster_printers_seen
if was_cluster_before: if was_cluster_before:
Logger.log("d", "Printer [%s] had Cura Connect before, so assume it's still equipped with Cura Connect.", name) Logger.log("d", "Printer [%s] had Cura Connect before, so assume it's still equipped with Cura Connect.", name)
if force_cluster or cluster_size >= 0 or was_cluster_before: if force_cluster or cluster_size >= 0 or was_cluster_before:
@ -228,7 +228,7 @@ class NetworkPrinterOutputDevicePlugin(QObject, OutputDevicePlugin):
else: else:
printer = NetworkPrinterOutputDevice.NetworkPrinterOutputDevice(name, address, properties, self._api_prefix) printer = NetworkPrinterOutputDevice.NetworkPrinterOutputDevice(name, address, properties, self._api_prefix)
self._printers[printer.getKey()] = printer self._printers[printer.getKey()] = printer
self._printers_seen[printer.getKey()] = printer # Printers that are temporary unreachable or is rebooted are stored here self._cluster_printers_seen[printer.getKey()] = name # Cluster printers that may be temporary unreachable or is rebooted keep being stored here
global_container_stack = Application.getInstance().getGlobalContainerStack() global_container_stack = Application.getInstance().getGlobalContainerStack()
if global_container_stack and printer.getKey() == global_container_stack.getMetaDataEntry("um_network_key"): if global_container_stack and printer.getKey() == global_container_stack.getMetaDataEntry("um_network_key"):
if printer.getKey() not in self._old_printers: # Was the printer already connected, but a re-scan forced? if printer.getKey() not in self._old_printers: # Was the printer already connected, but a re-scan forced?