From f3927115d6e0cc2a45de2507f64c8c4bdafe08f8 Mon Sep 17 00:00:00 2001 From: Tom Hofman Date: Tue, 31 Mar 2020 17:21:22 +0200 Subject: [PATCH 1/5] Infill wipe distance reduced Since it was protruding the shell --- resources/definitions/anet3d.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/anet3d.def.json b/resources/definitions/anet3d.def.json index 5caf171487..1381a6c6ee 100644 --- a/resources/definitions/anet3d.def.json +++ b/resources/definitions/anet3d.def.json @@ -85,7 +85,7 @@ "infill_before_walls": { "value": true }, "infill_overlap": { "value": 30.0 }, "skin_overlap": { "value": 10.0 }, - "infill_wipe_dist": { "value": 1.0 }, + "infill_wipe_dist": { "value": 0 }, "wall_0_wipe_dist": { "value": 0.2 }, "fill_perimeter_gaps": { "value": "'everywhere'" }, From 6d56b52913190016933f2885b98ae1a9ef700183 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Thu, 2 Apr 2020 15:15:05 +0200 Subject: [PATCH 2/5] Revert "Fix binding loop in action panel widget" Fix improper player slider layout which was introduced in 5cfe71e5 --- resources/qml/ActionButton.qml | 11 ++++++++++- resources/qml/ActionPanel/ActionPanelWidget.qml | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/resources/qml/ActionButton.qml b/resources/qml/ActionButton.qml index 6d28d0ed52..03c5a84cb4 100644 --- a/resources/qml/ActionButton.qml +++ b/resources/qml/ActionButton.qml @@ -49,6 +49,15 @@ Button height: UM.Theme.getSize("action_button").height hoverEnabled: true + Component.onCompleted: { + if(fixedWidthMode){ + buttonText.width = width - leftPadding - rightPadding + } else { + buttonText.width = (maximumWidth != 0 && contentWidth > maximumWidth) ? maximumWidth : undefined + } + } + + contentItem: Row { spacing: UM.Theme.getSize("narrow_margin").width @@ -84,9 +93,9 @@ Button font: UM.Theme.getFont("medium") visible: text != "" renderType: Text.NativeRendering + // width is set by parent because it depends on button.fixedWidthMode height: parent.height anchors.verticalCenter: parent.verticalCenter - width: fixedWidthMode ? button.width - button.leftPadding - button.rightPadding : ((maximumWidth != 0 && contentWidth > maximumWidth) ? maximumWidth : undefined) horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter elide: Text.ElideRight diff --git a/resources/qml/ActionPanel/ActionPanelWidget.qml b/resources/qml/ActionPanel/ActionPanelWidget.qml index 4d9a5eeb69..deb7275e78 100644 --- a/resources/qml/ActionPanel/ActionPanelWidget.qml +++ b/resources/qml/ActionPanel/ActionPanelWidget.qml @@ -15,6 +15,7 @@ import Cura 1.0 as Cura Item { id: base + width: actionPanelWidget.width + additionalComponents.width height: childrenRect.height visible: CuraApplication.platformActivity From 9d9753cb4582553070a66a2b3d635159d41f9cb3 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Thu, 2 Apr 2020 16:31:29 +0200 Subject: [PATCH 3/5] Fix: Using onCompleted would break the binding. So Use a Binding instead --- resources/qml/ActionButton.qml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/resources/qml/ActionButton.qml b/resources/qml/ActionButton.qml index 03c5a84cb4..d55c64029b 100644 --- a/resources/qml/ActionButton.qml +++ b/resources/qml/ActionButton.qml @@ -49,15 +49,6 @@ Button height: UM.Theme.getSize("action_button").height hoverEnabled: true - Component.onCompleted: { - if(fixedWidthMode){ - buttonText.width = width - leftPadding - rightPadding - } else { - buttonText.width = (maximumWidth != 0 && contentWidth > maximumWidth) ? maximumWidth : undefined - } - } - - contentItem: Row { spacing: UM.Theme.getSize("narrow_margin").width @@ -93,12 +84,22 @@ Button font: UM.Theme.getFont("medium") visible: text != "" renderType: Text.NativeRendering - // width is set by parent because it depends on button.fixedWidthMode height: parent.height anchors.verticalCenter: parent.verticalCenter horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter elide: Text.ElideRight + + Binding + { + // When settting width directly, an unjust binding loop warning would be triggered, + // because button.width is part of this expression. + // Using parent.width is fine in fixedWidthMode. + target: buttonText + property: "width" + value: button.fixedWidthMode ? button.width - button.leftPadding - button.rightPadding + : ((maximumWidth != 0 && contentWidth > maximumWidth) ? maximumWidth : undefined) + } } //Right side icon. Only displayed if isIconOnRightSide. From c6dfb6e4cf77176a0da7c49e5af4171bd6d0e732 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 2 Apr 2020 16:44:18 +0200 Subject: [PATCH 4/5] Set FirmwareUpdater in error state if file is empty CURA-6Q --- cura/PrinterOutput/FirmwareUpdater.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cura/PrinterOutput/FirmwareUpdater.py b/cura/PrinterOutput/FirmwareUpdater.py index 56e260a7f0..80269b97a3 100644 --- a/cura/PrinterOutput/FirmwareUpdater.py +++ b/cura/PrinterOutput/FirmwareUpdater.py @@ -33,6 +33,10 @@ class FirmwareUpdater(QObject): else: self._firmware_file = firmware_file + if self._firmware_file == "": + self._setFirmwareUpdateState(FirmwareUpdateState.firmware_not_found_error) + return + self._setFirmwareUpdateState(FirmwareUpdateState.updating) self._update_firmware_thread.start() From 6df2f84c0795d20f96a0e41b20e8bd990ce12425 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 2 Apr 2020 16:51:32 +0200 Subject: [PATCH 5/5] Prevent crash when releasing released lock CURA-C2 --- plugins/ImageReader/ImageReaderUI.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/plugins/ImageReader/ImageReaderUI.py b/plugins/ImageReader/ImageReaderUI.py index 512bf9f8be..5529f9a89e 100644 --- a/plugins/ImageReader/ImageReaderUI.py +++ b/plugins/ImageReader/ImageReaderUI.py @@ -92,13 +92,21 @@ class ImageReaderUI(QObject): def onOkButtonClicked(self): self._cancelled = False self._ui_view.close() - self._ui_lock.release() + try: + self._ui_lock.release() + except RuntimeError: + # We don't really care if it was held or not. Just make sure it's not held now + pass @pyqtSlot() def onCancelButtonClicked(self): self._cancelled = True self._ui_view.close() - self._ui_lock.release() + try: + self._ui_lock.release() + except RuntimeError: + # We don't really care if it was held or not. Just make sure it's not held now + pass @pyqtSlot(str) def onWidthChanged(self, value):