From cbd0bcd1b572dd9d9eb80c2ad918a5c132fd0106 Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Mon, 9 Oct 2017 14:49:18 +0200 Subject: [PATCH 01/11] Manually trigger upload finished callback after request finished - CURA-4398 --- plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py b/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py index af2e1f8c00..12c68079b0 100755 --- a/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py +++ b/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py @@ -23,10 +23,8 @@ from PyQt5.QtWidgets import QMessageBox import json import os import gzip -import zlib from time import time -from time import sleep i18n_catalog = i18nCatalog("cura") @@ -1179,6 +1177,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice): # Remove cached post request items. del self._material_post_objects[id(reply)] elif "print_job" in reply_url: + self._onUploadFinished() # Make sure the upload flag is reset as reply.finished is not always triggered try: reply.uploadProgress.disconnect(self._onUploadProgress) except: From 8a25605413cd5b2d07d23a67d1ceadfbc7818050 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 9 Oct 2017 15:04:27 +0200 Subject: [PATCH 02/11] Fix lock issue with workspace dialog CURA-4405 - Add try-except around lock release - Fix closing the dialog with ESC --- plugins/3MFReader/WorkspaceDialog.py | 19 ++++++++++++++++--- plugins/3MFReader/WorkspaceDialog.qml | 10 +++++++++- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/plugins/3MFReader/WorkspaceDialog.py b/plugins/3MFReader/WorkspaceDialog.py index 7c803486eb..5e5eaf985e 100644 --- a/plugins/3MFReader/WorkspaceDialog.py +++ b/plugins/3MFReader/WorkspaceDialog.py @@ -272,12 +272,26 @@ class WorkspaceDialog(QObject): def notifyClosed(self): self._result = {} # The result should be cleared before hide, because after it is released the main thread lock self._visible = False - self._lock.release() + try: + self._lock.release() + except: + pass def hide(self): self._visible = False self._view.hide() - self._lock.release() + try: + self._lock.release() + except: + pass + + @pyqtSlot(bool) + def _onVisibilityChanged(self, visible): + if not visible: + try: + self._lock.release() + except: + pass @pyqtSlot() def onOkButtonClicked(self): @@ -290,7 +304,6 @@ class WorkspaceDialog(QObject): self._view.hide() self.hide() - ## Block thread until the dialog is closed. def waitForClose(self): if self._visible: diff --git a/plugins/3MFReader/WorkspaceDialog.qml b/plugins/3MFReader/WorkspaceDialog.qml index e9ef14dfa5..a633491248 100644 --- a/plugins/3MFReader/WorkspaceDialog.qml +++ b/plugins/3MFReader/WorkspaceDialog.qml @@ -10,6 +10,7 @@ import UM 1.1 as UM UM.Dialog { + id: base title: catalog.i18nc("@title:window", "Open Project") minimumWidth: 500 * screenScaleFactor @@ -30,6 +31,7 @@ UM.Dialog materialResolveComboBox.currentIndex = 0 } } + Item { anchors.fill: parent @@ -377,7 +379,7 @@ UM.Dialog anchors.right: ok_button.left anchors.rightMargin: 2 * screenScaleFactor } - Button + Button { id: ok_button text: catalog.i18nc("@action:button","Open"); @@ -386,4 +388,10 @@ UM.Dialog anchors.right: parent.right } } + + function reject() { + manager.onCancelButtonClicked(); + base.visible = false; + base.rejected(); + } } From f8a1187a8c8d36e166cd12d1af255784740bdc57 Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Mon, 9 Oct 2017 16:14:02 +0200 Subject: [PATCH 03/11] Re-sending after cancelling print job now really works - CURA-4398 --- plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py b/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py index 12c68079b0..b88feb6095 100755 --- a/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py +++ b/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py @@ -836,6 +836,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice): Logger.log("d", "User aborted sending print to remote.") self._progress_message.hide() self._compressing_print = False + self._write_finished = True # post_reply does not always exist, so make sure we unblock writing if self._post_reply: self._finalizePostReply() Application.getInstance().showPrintMonitor.emit(False) From 1d70426224deb0fe8c03837afe928c43568de2d0 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Mon, 9 Oct 2017 16:36:48 +0200 Subject: [PATCH 04/11] onVisibilityChanged function removed because it's never called - CURA-4405 --- plugins/3MFReader/WorkspaceDialog.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/plugins/3MFReader/WorkspaceDialog.py b/plugins/3MFReader/WorkspaceDialog.py index 5e5eaf985e..349dec177b 100644 --- a/plugins/3MFReader/WorkspaceDialog.py +++ b/plugins/3MFReader/WorkspaceDialog.py @@ -285,14 +285,6 @@ class WorkspaceDialog(QObject): except: pass - @pyqtSlot(bool) - def _onVisibilityChanged(self, visible): - if not visible: - try: - self._lock.release() - except: - pass - @pyqtSlot() def onOkButtonClicked(self): self._view.hide() From 019121521589908fc5328f19003704e71f25d680 Mon Sep 17 00:00:00 2001 From: Simon Edwards Date: Mon, 9 Oct 2017 15:27:01 +0200 Subject: [PATCH 05/11] Let the printer state text wrap too CL-521 --- plugins/UM3NetworkPrinting/PrinterInfoBlock.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml index da5ebc7e37..e2c6473da7 100644 --- a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +++ b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml @@ -404,6 +404,8 @@ Rectangle anchors.left: parent.left anchors.right: parent.right elide: Text.ElideRight + wrapMode: Text.Wrap + font: UM.Theme.getFont("default") } From ebb8437bff60bfc00cbeba771fc14c2be6524234 Mon Sep 17 00:00:00 2001 From: Simon Edwards Date: Mon, 9 Oct 2017 15:41:18 +0200 Subject: [PATCH 06/11] Avoid using fractional pixel sizes and positions. It causes poor text rendering on Windows (and may be others) --- plugins/UM3NetworkPrinting/PrinterInfoBlock.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml index e2c6473da7..25be77bd7d 100644 --- a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +++ b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml @@ -189,7 +189,7 @@ Rectangle PrintCoreConfiguration { id: leftExtruderInfo - width: (parent.width - extruderSeperator.width) / 2 + width: Math.floor((parent.width - extruderSeperator.width) / 2) printCoreConfiguration: printer.configuration[0] } @@ -204,7 +204,7 @@ Rectangle PrintCoreConfiguration { id: rightExtruderInfo - width: (parent.width - extruderSeperator.width) / 2 + width: Math.floor((parent.width - extruderSeperator.width) / 2) printCoreConfiguration: printer.configuration[1] } } From 7b6faf0030d9455f772c364ce4c9f16ae0bf1e21 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 10 Oct 2017 08:03:08 +0200 Subject: [PATCH 07/11] Adjust column width for Materials "Print Settings" page CURA-4428 --- resources/qml/Preferences/MaterialView.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/Preferences/MaterialView.qml b/resources/qml/Preferences/MaterialView.qml index c1750b2342..b13ce1aadf 100644 --- a/resources/qml/Preferences/MaterialView.qml +++ b/resources/qml/Preferences/MaterialView.qml @@ -16,8 +16,8 @@ TabView property bool editingEnabled: false; property string currency: UM.Preferences.getValue("cura/currency") ? UM.Preferences.getValue("cura/currency") : "€" - property real firstColumnWidth: (width * 0.45) | 0 - property real secondColumnWidth: (width * 0.45) | 0 + property real firstColumnWidth: (width * 0.50) | 0 + property real secondColumnWidth: (width * 0.40) | 0 property string containerId: "" property var materialPreferenceValues: UM.Preferences.getValue("cura/material_settings") ? JSON.parse(UM.Preferences.getValue("cura/material_settings")) : {} From 7ca2ae9771d76b40587ba8a414debcb1dd89300d Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 10 Oct 2017 08:20:39 +0200 Subject: [PATCH 08/11] Adjust alignments for ComboBoxes in MachineSettings dialog CURA-4428 --- plugins/MachineSettingsAction/MachineSettingsAction.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.qml b/plugins/MachineSettingsAction/MachineSettingsAction.qml index 613a28f3b7..cd7738da11 100644 --- a/plugins/MachineSettingsAction/MachineSettingsAction.qml +++ b/plugins/MachineSettingsAction/MachineSettingsAction.qml @@ -247,7 +247,7 @@ Cura.MachineAction Row { - spacing: UM.Theme.getSize("default_margin").width + spacing: UM.Theme.getSize("default_margin").width * 4 / 5 Label { @@ -648,7 +648,7 @@ Cura.MachineAction Row { - spacing: UM.Theme.getSize("default_margin").width + spacing: UM.Theme.getSize("default_margin").width * 4 / 5 Label { From 60726ce1793ae9dd3736912e59f627dc12153903 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 10 Oct 2017 08:24:47 +0200 Subject: [PATCH 09/11] Increase minimumHeight of the Print Address dialog CURA-4428 --- plugins/UM3NetworkPrinting/DiscoverUM3Action.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml b/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml index b9b85ef2d4..7594d1691d 100644 --- a/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml +++ b/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml @@ -321,7 +321,7 @@ Cura.MachineAction title: catalog.i18nc("@title:window", "Printer Address") minimumWidth: 400 * screenScaleFactor - minimumHeight: 120 * screenScaleFactor + minimumHeight: 130 * screenScaleFactor width: minimumWidth height: minimumHeight From b14ef41056777636911cc907d082862eaf6eee36 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 10 Oct 2017 08:30:18 +0200 Subject: [PATCH 10/11] Increase the minimumHeight of the workspace summary dialog CURA-4428 --- plugins/3MFReader/WorkspaceDialog.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/3MFReader/WorkspaceDialog.qml b/plugins/3MFReader/WorkspaceDialog.qml index a633491248..b1ece2be96 100644 --- a/plugins/3MFReader/WorkspaceDialog.qml +++ b/plugins/3MFReader/WorkspaceDialog.qml @@ -14,7 +14,7 @@ UM.Dialog title: catalog.i18nc("@title:window", "Open Project") minimumWidth: 500 * screenScaleFactor - minimumHeight: 400 * screenScaleFactor + minimumHeight: 450 * screenScaleFactor width: minimumWidth height: minimumHeight From 9996c829d88684b8a15a5a120a485d795e966d02 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 10 Oct 2017 08:50:22 +0200 Subject: [PATCH 11/11] Only schedule re-slice when there is none in progress CURA-4427 After the stack error check is done, only schedule a re-slice when there is none in progress and a re-slice is needed. --- plugins/CuraEngineBackend/CuraEngineBackend.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index c89f476fa9..914aa1dee0 100755 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -441,7 +441,7 @@ class CuraEngineBackend(QObject, Backend): def _onStackErrorCheckFinished(self): self._is_error_check_scheduled = False - if self._need_slicing: + if not self._slicing and self._need_slicing: self.needsSlicing() self._onChanged() @@ -536,7 +536,6 @@ class CuraEngineBackend(QObject, Backend): # # \param message The protobuf message containing the print time per feature def _parseMessagePrintTimes(self, message): - result = { "inset_0": message.time_inset_0, "inset_x": message.time_inset_x,