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

Merge branch 'master' into fieldOfView-feature_firmware_updater

Browse source 
Conflicts:
	cura/PrinterOutput/PrinterOutputModel.py - Bunch of code that was moved.
	plugins/USBPrinting/USBPrinterOutputDevice.py - Collisions with code style fixes.
	plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml - Bunch of code that was moved.
This commit is contained in:
Ghostkeeper 2018-10-15 16:52:22 +02:00
commit b5d8c1af6f
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
27 changed files with 253 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cura/PrinterOutput/NetworkedPrinterOutputDevice.py
View file

@ -130,9 +130,7 @@ class NetworkedPrinterOutputDevice(PrinterOutputDevice):
# We need to check if the manager needs to be re-created. If we don't, we get some issues when OSX goes to
# sleep.
if time_since_last_response > self._recreate_network_manager_time:
if self._last_manager_create_time is None:
self._createNetworkManager()
elif time() - self._last_manager_create_time > self._recreate_network_manager_time:
if self._last_manager_create_time is None or time() - self._last_manager_create_time > self._recreate_network_manager_time:
self._createNetworkManager()
assert(self._manager is not None)
elif self._connection_state == ConnectionState.closed:

2
cura/PrinterOutput/PrinterOutputModel.py
View file

@ -175,7 +175,7 @@ class PrinterOutputModel(QObject):
def getController(self) -> "PrinterOutputController":
return self._controller
@pyqtProperty(str, notify=nameChanged)
@pyqtProperty(str, notify = nameChanged)
def name(self) -> str:
return self._name