GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 19:05:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Renamed generic key to um_network_key

Browse Source 
CURA-49
This commit is contained in:
Jaime van Kessel 2016-06-28 11:48:54 +02:00
parent 07c25edb0f
commit 76dfb5e718
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DiscoverUM3Action.py
View File

@ -36,9 +36,9 @@ class DiscoverUM3Action(MachineAction):
global_container_stack = Application.getInstance().getGlobalContainerStack() global_container_stack = Application.getInstance().getGlobalContainerStack()
if global_container_stack: if global_container_stack:
if "key" in global_container_stack.getMetaData(): if "key" in global_container_stack.getMetaData():
global_container_stack.setMetaDataEntry("key", key) global_container_stack.setMetaDataEntry("um_network_key", key)
else: else:
global_container_stack.addMetaDataEntry("key", key) global_container_stack.addMetaDataEntry("um_network_key", key)
if self._network_plugin: if self._network_plugin:
# Ensure that the connection states are refreshed. # Ensure that the connection states are refreshed.

4
NetworkPrinterOutputDevicePlugin.py
View File

@ -40,7 +40,7 @@ class NetworkPrinterOutputDevicePlugin(OutputDevicePlugin):
return return
for key in self._printers: for key in self._printers:
if key == active_machine.getMetaDataEntry("key"): if key == active_machine.getMetaDataEntry("um_network_key"):
self._printers[key].connect() self._printers[key].connect()
self._printers[key].connectionStateChanged.connect(self._onPrinterConnectionStateChanged) self._printers[key].connectionStateChanged.connect(self._onPrinterConnectionStateChanged)
else: else:
@ -51,7 +51,7 @@ class NetworkPrinterOutputDevicePlugin(OutputDevicePlugin):
printer = NetworkPrinterOutputDevice.NetworkPrinterOutputDevice(name, address, properties) printer = NetworkPrinterOutputDevice.NetworkPrinterOutputDevice(name, address, properties)
self._printers[printer.getKey()] = printer self._printers[printer.getKey()] = printer
global_container_stack = Application.getInstance().getGlobalContainerStack() global_container_stack = Application.getInstance().getGlobalContainerStack()
if global_container_stack and printer.getKey() == global_container_stack.getMetaDataEntry("key"): if global_container_stack and printer.getKey() == global_container_stack.getMetaDataEntry("um_network_key"):
self._printers[printer.getKey()].connect() self._printers[printer.getKey()].connect()
printer.connectionStateChanged.connect(self._onPrinterConnectionStateChanged) printer.connectionStateChanged.connect(self._onPrinterConnectionStateChanged)