Renamed connections to printers

CURA-49
This commit is contained in:
Jaime van Kessel 2016-04-19 09:48:21 +02:00
parent d621162a9b
commit 0ad1c1a3a7

View file

@ -11,7 +11,7 @@ class WifiOutputDevicePlugin(OutputDevicePlugin, SignalEmitter):
super().__init__() super().__init__()
self._zero_conf = Zeroconf() self._zero_conf = Zeroconf()
self._browser = None self._browser = None
self._connections = {} self._printers = {}
# 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.addConnectionSignal.connect(self.addConnection) self.addConnectionSignal.connect(self.addConnection)
@ -29,26 +29,26 @@ class WifiOutputDevicePlugin(OutputDevicePlugin, SignalEmitter):
def _onActiveMachineInstanceChanged(self): def _onActiveMachineInstanceChanged(self):
active_machine_key = Application.getInstance().getMachineManager().getActiveMachineInstance().getKey() active_machine_key = Application.getInstance().getMachineManager().getActiveMachineInstance().getKey()
for address in self._connections: for address in self._printers:
if self._connections[address].getKey() == active_machine_key: if self._printers[address].getKey() == active_machine_key:
self._connections[address].connect() self._printers[address].connect()
self._connections[address].connectionStateChanged.connect(self._onPrinterConnectionStateChanged) self._printers[address].connectionStateChanged.connect(self._onPrinterConnectionStateChanged)
else: else:
self._connections[address].close() self._printers[address].close()
## 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 addConnection(self, name, address, properties): def addConnection(self, name, address, properties):
connection = NetworkPrinterOutputDevice.NetworkPrinterOutputDevice(name, address, properties) connection = NetworkPrinterOutputDevice.NetworkPrinterOutputDevice(name, address, properties)
self._connections[address] = connection self._printers[address] = connection
if connection.getKey() == Application.getInstance().getMachineManager().getActiveMachineInstance().getKey(): if connection.getKey() == Application.getInstance().getMachineManager().getActiveMachineInstance().getKey():
self._connections[address].connect() self._printers[address].connect()
connection.connectionStateChanged.connect(self._onPrinterConnectionStateChanged) connection.connectionStateChanged.connect(self._onPrinterConnectionStateChanged)
def _onPrinterConnectionStateChanged(self, address): def _onPrinterConnectionStateChanged(self, address):
if self._connections[address].isConnected(): if self._printers[address].isConnected():
self.getOutputDeviceManager().addOutputDevice(self._connections[address]) self.getOutputDeviceManager().addOutputDevice(self._printers[address])
else: else:
self.getOutputDeviceManager().removeOutputDevice(self._connections[address]) self.getOutputDeviceManager().removeOutputDevice(self._printers[address])
def removeConnection(self): def removeConnection(self):
pass pass