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

Fix this sh*t

Browse source 
Sorry, I kind of dropped the ball before.
This commit is contained in:
fieldOfView 2018-10-02 17:08:39 +02:00
parent 91ee691c80
commit 3908781f6f
2 changed files with 35 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

38
cura/PrinterOutput/FirmwareUpdater.py
View file

@ -16,6 +16,8 @@ class FirmwareUpdater(QObject):
firmwareUpdateStateChanged = pyqtSignal()
def __init__(self, output_device: PrinterOutputDevice) -> None:
super().__init__()
self._output_device = output_device
self._update_firmware_thread = Thread(target=self._updateFirmware, daemon=True)
@ -31,29 +33,35 @@ class FirmwareUpdater(QObject):
self._firmware_location = QUrl(file).toLocalFile()
else:
self._firmware_location = file
self.showFirmwareInterface()
self.setFirmwareUpdateState(FirmwareUpdateState.updating)
self._showFirmwareInterface()
self._setFirmwareUpdateState(FirmwareUpdateState.updating)
self._update_firmware_thread.start()
def _updateFirmware(self) -> None:
raise NotImplementedError("_updateFirmware needs to be implemented")
def cleanupAfterUpdate(self) -> None:
## Show firmware interface.
# This will create the view if its not already created.
def _showFirmwareInterface(self) -> None:
if self._firmware_view is None:
path = Resources.getPath(CuraApplication.ResourceTypes.QmlFiles, "FirmwareUpdateWindow.qml")
self._firmware_view = CuraApplication.getInstance().createQmlComponent(path, {"manager": self})
if not self._firmware_view:
return
self._onFirmwareProgress(0)
self._setFirmwareUpdateState(FirmwareUpdateState.idle)
self._firmware_view.show()
## Cleanup after a succesful update
def _cleanupAfterUpdate(self) -> None:
# Clean up for next attempt.
self._update_firmware_thread = Thread(target=self._updateFirmware, daemon=True)
self._firmware_location = ""
self._onFirmwareProgress(100)
self.setFirmwareUpdateState(FirmwareUpdateState.completed)
## Show firmware interface.
# This will create the view if its not already created.
def showFirmwareInterface(self) -> None:
if self._firmware_view is None:
path = Resources.getPath(self.ResourceTypes.QmlFiles, "FirmwareUpdateWindow.qml")
self._firmware_view = CuraApplication.getInstance().createQmlComponent(path, {"manager": self})
if self._firmware_view:
self._firmware_view.show()
self._setFirmwareUpdateState(FirmwareUpdateState.completed)
@pyqtProperty(float, notify = firmwareProgressChanged)
def firmwareProgress(self) -> float:
@ -63,7 +71,7 @@ class FirmwareUpdater(QObject):
def firmwareUpdateState(self) -> "FirmwareUpdateState":
return self._firmware_update_state
def setFirmwareUpdateState(self, state) -> None:
def _setFirmwareUpdateState(self, state) -> None:
if self._firmware_update_state != state:
self._firmware_update_state = state
self.firmwareUpdateStateChanged.emit()