3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-16 19:28:07 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Callbacks are now handled by url and operation type.

Browse source 
It would have been nicer to use the request, but it's unhashable.

Cl-541
This commit is contained in:
Jaime van Kessel 2017-11-20 15:12:29 +01:00
parent 03304003af
commit 61753540e4
4 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cura/PrinterOutput/NetworkedPrinterOutputDevice.py
View file

@ -37,13 +37,13 @@ class NetworkedPrinterOutputDevice(PrinterOutputDevice):
def _put(self, target: str, data: str, onFinished: Callable): def _put(self, target: str, data: str, onFinished: Callable):
request = self._createEmptyRequest(target) request = self._createEmptyRequest(target)
self._onFinishedCallbacks[request] = onFinished reply = self._manager.put(request, data.encode())
self._manager.put(request, data.encode()) self._onFinishedCallbacks[reply.url().toString() + str(reply.operation())] = onFinished
def _get(self, target: str, onFinished: Callable): def _get(self, target: str, onFinished: Callable):
request = self._createEmptyRequest(target) request = self._createEmptyRequest(target)
self._onFinishedCallbacks[request] = onFinished reply = self._manager.get(request)
self._manager.get(request) self._onFinishedCallbacks[reply.url().toString() + str(reply.operation())] = onFinished
def _delete(self, target: str, onFinished: Callable): def _delete(self, target: str, onFinished: Callable):
pass pass
@ -65,8 +65,7 @@ class NetworkedPrinterOutputDevice(PrinterOutputDevice):
def __handleOnFinished(self, reply: QNetworkReply): def __handleOnFinished(self, reply: QNetworkReply):
self._last_response_time = time() self._last_response_time = time()
try: try:
self._onFinishedCallbacks[reply.request()](reply) self._onFinishedCallbacks[reply.url().toString() + str(reply.operation())](reply)
del self._onFinishedCallbacks[reply.request] # Remove the callback.
except Exception as e: except Exception as e:
print("Something went wrong with callback", e) print("Something went wrong with callback", e)
pass pass

2
plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py
View file

@ -7,5 +7,3 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
def _update(self): def _update(self):
super()._update() super()._update()
pass

6
plugins/UM3NetworkPrinting/DiscoverUM3Action.qml
View file

@ -29,6 +29,12 @@ Cura.MachineAction
function connectToPrinter() function connectToPrinter()
{ {
if(base.selectedDevice)
{
var deviceKey = base.selectedDevice.key
manager.setKey(deviceKey);
completed();
}
if(base.selectedPrinter && base.completeProperties) if(base.selectedPrinter && base.completeProperties)
{ {
var printerKey = base.selectedDevice.key var printerKey = base.selectedDevice.key

3
plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py
View file

@ -1,8 +1,9 @@
from cura.PrinterOutput.NetworkedPrinterOutputDevice import NetworkedPrinterOutputDevice from cura.PrinterOutput.NetworkedPrinterOutputDevice import NetworkedPrinterOutputDevice
class LegacyUM3OutputDevice(NetworkedPrinterOutputDevice): class LegacyUM3OutputDevice(NetworkedPrinterOutputDevice):
def __init__(self, device_id, address: str, properties, parent = None): def __init__(self, device_id, address: str, properties, parent = None):
super().__init__(device_id = device_id, address = address, properties = properties, parent = parent) super().__init__(device_id = device_id, address = address, properties = properties, parent = parent)
def _update(self): def _update(self):
pass super()._update()