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

Fix USB printing on Linux

Browse source 
Contributes to #82
This commit is contained in:
Arjen Hiemstra 2015-07-07 11:24:26 +02:00
parent 17e5d1f835
commit a9f109fd74
2 changed files with 45 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

24
plugins/USBPrinting/USBPrinterManager.py
View file

@ -47,7 +47,7 @@ class USBPrinterManager(QObject, SignalEmitter, Extension):
self.setMenuName("Firmware")
self.addMenuItem(i18n_catalog.i18n("Update Firmware"), self.updateAllFirmware)
pyqtError = pyqtSignal(str, arguments = ["amount"])
pyqtError = pyqtSignal(str, arguments = ["error"])
processingProgress = pyqtSignal(float, arguments = ["amount"])
pyqtExtruderTemperature = pyqtSignal(float, arguments = ["amount"])
pyqtBedTemperature = pyqtSignal(float, arguments = ["amount"])
@ -59,9 +59,9 @@ class USBPrinterManager(QObject, SignalEmitter, Extension):
path = QUrl.fromLocalFile(os.path.join(PluginRegistry.getInstance().getPluginPath("USBPrinting"), "FirmwareUpdateWindow.qml"))
component = QQmlComponent(Application.getInstance()._engine, path)
context = QQmlContext(Application.getInstance()._engine.rootContext())
context.setContextProperty("manager", self)
self._firmware_view = component.create(context)
self._firmware_context = QQmlContext(Application.getInstance()._engine.rootContext())
self._firmware_context.setContextProperty("manager", self)
self._firmware_view = component.create(self._firmware_context)
self._firmware_view.show()
@ -72,10 +72,10 @@ class USBPrinterManager(QObject, SignalEmitter, Extension):
path = QUrl.fromLocalFile(os.path.join(PluginRegistry.getInstance().getPluginPath("USBPrinting"), "ControlWindow.qml"))
component = QQmlComponent(Application.getInstance()._engine, path)
context = QQmlContext(Application.getInstance()._engine.rootContext())
context.setContextProperty("manager", self)
self._control_context = QQmlContext(Application.getInstance()._engine.rootContext())
self._control_context.setContextProperty("manager", self)
self._control_view = component.create(context)
self._control_view = component.create(self._control_context)
self._control_view.show()
@ -175,8 +175,8 @@ class USBPrinterManager(QObject, SignalEmitter, Extension):
## Callback for error
def onError(self, error):
self._error_message = error
self.pyqtError.emit(error)
self._error_message = error if type(error) is str else error.decode("utf-8")
self.pyqtError.emit(self._error_message)
## Callback for progress change
def onProgress(self, progress, serial_port):
@ -241,9 +241,9 @@ class USBPrinterManager(QObject, SignalEmitter, Extension):
Application.getInstance().addOutputDevice(serial_port, {
"id": serial_port,
"function": self.spawnControlInterface,
"description": "Print through USB {0}".format(serial_port),
"shortDescription": "Print through USB",
"icon": "print_usb",
"description": "Print with USB {0}".format(serial_port),
"shortDescription": "Print with USB",
"icon": "save",
"priority": 1
})
else: