From b9f73a8eefb96507cb6b076e32eb33bf0c14f079 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 30 Jun 2016 09:35:57 +0200 Subject: [PATCH 1/2] Hiding messages is now only done when there are messages CURA-49 --- NetworkPrinterOutputDevice.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/NetworkPrinterOutputDevice.py b/NetworkPrinterOutputDevice.py index f62fc6df5a..ebe850e323 100644 --- a/NetworkPrinterOutputDevice.py +++ b/NetworkPrinterOutputDevice.py @@ -185,9 +185,11 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice): def close(self): self.setConnectionState(ConnectionState.closed) - self._progress_message.hide() + if self._progress_message: + self._progress_message.hide() self._authentication_requested_message.hide() - self._error_message.hide() + if self._error_message: + self._error_message.hide() self._authentication_counter = 0 self._authentication_timer.stop() self._update_timer.stop() From a4117bd3bebbb1edf4be8727c59f181e324ee701 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 30 Jun 2016 09:52:48 +0200 Subject: [PATCH 2/2] Display data is reset upon job completion --- NetworkPrinterOutputDevice.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NetworkPrinterOutputDevice.py b/NetworkPrinterOutputDevice.py index ebe850e323..0c8805e026 100644 --- a/NetworkPrinterOutputDevice.py +++ b/NetworkPrinterOutputDevice.py @@ -351,8 +351,11 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice): self.setTimeTotal(json_data["time_total"]) self.setJobName(json_data["name"]) elif reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) == 404: - self.setProgress(0) # No print job found, so there can't be progress! + self.setProgress(0) # No print job found, so there can't be progress or other data. self._updateJobState("") + self.setTimeElapsed(0) + self.setTimeTotal(0) + self.setJobName("") elif "snapshot" in reply.url().toString(): # Status update from image: if reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) == 200: self._camera_image.loadFromData(reply.readAll())