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

Changes to make the network plugin play well with setting_rework

Browse source 
CURA-49
This commit is contained in:
Jaime van Kessel 2016-06-13 13:34:22 +02:00
parent 65f329623f
commit 025bdba516
2 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
NetworkPrinterOutputDevicePlugin.py
View file

@ -18,7 +18,7 @@ class NetworkPrinterOutputDevicePlugin(OutputDevicePlugin, SignalEmitter):
# 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.
self.addPrinterSignal.connect(self.addPrinter) self.addPrinterSignal.connect(self.addPrinter)
Application.getInstance().globalContainerStackChanged.connect(self._onGlobalContainerStackChanged) Application.getInstance().globalContainerStackChanged.connect(self._onGlobalStackChanged)
addPrinterSignal = Signal() addPrinterSignal = Signal()
@ -30,15 +30,14 @@ class NetworkPrinterOutputDevicePlugin(OutputDevicePlugin, SignalEmitter):
def stop(self): def stop(self):
self._zero_conf.close() self._zero_conf.close()
def _onGlobalContainerStackChanged(self): def _onGlobalStackChanged(self):
try:
active_machine_key = Application.getInstance().getGlobalContainerStack().getId() active_machine = Application.getInstance().getGlobalContainerStack()
except AttributeError: if not active_machine:
## Active machine instance changed to None. This can happen upon clean start. Simply ignore.
return return
for key in self._printers: for key in self._printers:
if key == active_machine_key: if key == active_machine.getKey():
self._printers[key].connect() self._printers[key].connect()
self._printers[key].connectionStateChanged.connect(self._onPrinterConnectionStateChanged) self._printers[key].connectionStateChanged.connect(self._onPrinterConnectionStateChanged)
else: else:
@ -48,8 +47,7 @@ class NetworkPrinterOutputDevicePlugin(OutputDevicePlugin, SignalEmitter):
def addPrinter(self, name, address, properties): def addPrinter(self, name, address, properties):
printer = NetworkPrinterOutputDevice.NetworkPrinterOutputDevice(name, address, properties) printer = NetworkPrinterOutputDevice.NetworkPrinterOutputDevice(name, address, properties)
self._printers[printer.getKey()] = printer self._printers[printer.getKey()] = printer
stack = Application.getInstance().getGlobalContainerStack() if printer.getKey() == Application.getInstance().getGlobalContainerStack().getKey():
if stack and printer.getKey() == stack.getKey():
self._printers[printer.getKey()].connect() self._printers[printer.getKey()].connect()
printer.connectionStateChanged.connect(self._onPrinterConnectionStateChanged) printer.connectionStateChanged.connect(self._onPrinterConnectionStateChanged)
@ -72,4 +70,4 @@ class NetworkPrinterOutputDevicePlugin(OutputDevicePlugin, SignalEmitter):
elif state_change == ServiceStateChange.Removed: elif state_change == ServiceStateChange.Removed:
pass pass
# TODO; This isn't testable right now. We need to also decide how to handle # TODO; This isn't testable right now. We need to also decide how to handle
# #

3
__init__.py
View file

@ -16,5 +16,4 @@ def getMetaData():
} }
def register(app): def register(app):
return { "output_device": NetworkPrinterOutputDevicePlugin.NetworkPrinterOutputDevicePlugin()} return { "output_device": NetworkPrinterOutputDevicePlugin.NetworkPrinterOutputDevicePlugin()}