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

Merge remote-tracking branch 'UM3NetworkPrintingPlugin/master' into UM3NPP_merge

Browse source
This commit is contained in:
Thomas Karl Pietrowski 2016-11-24 21:40:07 +01:00
commit 37e57e587a
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plugins/UM3NetworkPrintingPlugin/NetworkPrinterOutputDevice.py
View file

@ -515,7 +515,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
# This is ignored. # This is ignored.
# \param filter_by_machine Whether to filter MIME types by machine. This # \param filter_by_machine Whether to filter MIME types by machine. This
# is ignored. # is ignored.
def requestWrite(self, nodes, file_name = None, filter_by_machine = False): def requestWrite(self, nodes, file_name = None, filter_by_machine = False, file_handler = None):
if self._progress != 0: if self._progress != 0:
self._error_message = Message(i18n_catalog.i18nc("@info:status", "Unable to start a new print job because the printer is busy. Please check the printer.")) self._error_message = Message(i18n_catalog.i18nc("@info:status", "Unable to start a new print job because the printer is busy. Please check the printer."))
self._error_message.show() self._error_message.show()
@ -814,6 +814,11 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
if self._connection_state_before_timeout and reply.error() == QNetworkReply.NoError: # There was a timeout, but we got a correct answer again. if self._connection_state_before_timeout and reply.error() == QNetworkReply.NoError: # There was a timeout, but we got a correct answer again.
Logger.log("d", "We got a response (%s) from the server after %0.1f of silence. Going back to previous state %s", reply.url().toString(), time() - self._last_response_time, self._connection_state_before_timeout) Logger.log("d", "We got a response (%s) from the server after %0.1f of silence. Going back to previous state %s", reply.url().toString(), time() - self._last_response_time, self._connection_state_before_timeout)
# Camera was active before timeout. Start it again
if self._camera_active:
self._startCamera()
self.setConnectionState(self._connection_state_before_timeout) self.setConnectionState(self._connection_state_before_timeout)
self._connection_state_before_timeout = None self._connection_state_before_timeout = None