From 19ce6aa65fab5da922ba720635155344182905a4 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 15 May 2019 13:27:33 +0200 Subject: [PATCH 1/4] Prime tower brim (unless raft) by default. [CURA-6492] --- resources/definitions/fdmprinter.def.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 5efe3d0a5d..7453531a80 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -5249,7 +5249,7 @@ "type": "bool", "enabled": "extruders_enabled_count > 1", "default_value": false, - "resolve": "(extruders_enabled_count > 1) and any(extruderValues('prime_tower_enable')) or (adhesion_type in ('none', 'skirt'))", + "resolve": "(extruders_enabled_count > 1) and any(extruderValues('prime_tower_enable'))", "settable_per_mesh": false, "settable_per_extruder": false }, @@ -5352,6 +5352,7 @@ "description": "Prime-towers might need the extra adhesion afforded by a brim even if the model doesn't. Presently can't be used with the 'Raft' adhesion-type.", "type": "bool", "enabled": "resolveOrValue('prime_tower_enable') and (resolveOrValue('adhesion_type') != 'raft')", + "resolve": "resolveOrValue('prime_tower_enable') and (adhesion_type in ('none', 'skirt'))", "default_value": false, "settable_per_mesh": false, "settable_per_extruder": false From c4044e731afc36a3e89b2f6e1a3730bda4363628 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Thu, 16 May 2019 12:04:26 +0200 Subject: [PATCH 2/4] Fix typo in a log warning message --- cura/PrinterOutput/PrintJobOutputModel.py | 2 +- cura/PrinterOutput/PrinterOutputModel.py | 2 +- cura/PrinterOutputDevice.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cura/PrinterOutput/PrintJobOutputModel.py b/cura/PrinterOutput/PrintJobOutputModel.py index a810d40e9a..df66412df3 100644 --- a/cura/PrinterOutput/PrintJobOutputModel.py +++ b/cura/PrinterOutput/PrintJobOutputModel.py @@ -1,4 +1,4 @@ import warnings -warnings.warn("Importing cura.PrinterOutput.PrintJobOutputModel has been deprecated since 4.1, use cura.PrinterOutput.Models.PrintJobOutputModel inststad", DeprecationWarning, stacklevel=2) +warnings.warn("Importing cura.PrinterOutput.PrintJobOutputModel has been deprecated since 4.1, use cura.PrinterOutput.Models.PrintJobOutputModel instead", DeprecationWarning, stacklevel=2) # We moved the the models to one submodule deeper from cura.PrinterOutput.Models.PrintJobOutputModel import PrintJobOutputModel \ No newline at end of file diff --git a/cura/PrinterOutput/PrinterOutputModel.py b/cura/PrinterOutput/PrinterOutputModel.py index 736e6c7aa3..87020ce2d0 100644 --- a/cura/PrinterOutput/PrinterOutputModel.py +++ b/cura/PrinterOutput/PrinterOutputModel.py @@ -1,4 +1,4 @@ import warnings -warnings.warn("Importing cura.PrinterOutput.PrinterOutputModel has been deprecated since 4.1, use cura.PrinterOutput.Models.PrinterOutputModel inststad", DeprecationWarning, stacklevel=2) +warnings.warn("Importing cura.PrinterOutput.PrinterOutputModel has been deprecated since 4.1, use cura.PrinterOutput.Models.PrinterOutputModel instead", DeprecationWarning, stacklevel=2) # We moved the the models to one submodule deeper from cura.PrinterOutput.Models.PrinterOutputModel import PrinterOutputModel \ No newline at end of file diff --git a/cura/PrinterOutputDevice.py b/cura/PrinterOutputDevice.py index 0da1ae349d..51e563410c 100644 --- a/cura/PrinterOutputDevice.py +++ b/cura/PrinterOutputDevice.py @@ -1,4 +1,4 @@ import warnings -warnings.warn("Importing cura.PrinterOutputDevice has been deprecated since 4.1, use cura.PrinterOutput.PrinterOutputDevice inststad", DeprecationWarning, stacklevel=2) +warnings.warn("Importing cura.PrinterOutputDevice has been deprecated since 4.1, use cura.PrinterOutput.PrinterOutputDevice instead", DeprecationWarning, stacklevel=2) # We moved the PrinterOutput device to it's own submodule. from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice, ConnectionState \ No newline at end of file From f3ea5228119051249682f8e3aa5f9a1c5beaec24 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 16 May 2019 13:40:33 +0200 Subject: [PATCH 3/4] Use === to compare strings in JavaScript --- .../Recommended/RecommendedAdhesionSelector.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml index 941199707c..4c4d42e64b 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml @@ -70,7 +70,7 @@ Item // Remove the "user" setting to see if the rest of the stack prescribes a brim or a raft platformAdhesionType.removeFromContainer(0) adhesionType = platformAdhesionType.properties.value - if(adhesionType == "skirt" || adhesionType == "none") + if(adhesionType === "skirt" || adhesionType === "none") { // If the rest of the stack doesn't prescribe an adhesion-type, default to a brim adhesionType = "brim" From 0352553193a975450c80796ce73247bc35223930 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 16 May 2019 14:23:36 +0200 Subject: [PATCH 4/4] Read resolved value for adhesion type We still write to the value property. We need the resolved value because we want to read from the extruder stacks which may overwrite the adhesion type in a profile. Contributes to issue CURA-6182. --- .../Recommended/RecommendedAdhesionSelector.qml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml index 4c4d42e64b..aaa10fbfcd 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml @@ -64,19 +64,19 @@ Item onClicked: { - var adhesionType = "skirt" + var adhesionType = "skirt"; if (!parent.checked) { // Remove the "user" setting to see if the rest of the stack prescribes a brim or a raft - platformAdhesionType.removeFromContainer(0) - adhesionType = platformAdhesionType.properties.value + platformAdhesionType.removeFromContainer(0); + adhesionType = platformAdhesionType.properties.resolve; if(adhesionType === "skirt" || adhesionType === "none") { // If the rest of the stack doesn't prescribe an adhesion-type, default to a brim - adhesionType = "brim" + adhesionType = "brim"; } } - platformAdhesionType.setPropertyValue("value", adhesionType) + platformAdhesionType.setPropertyValue("value", adhesionType); } onEntered: @@ -95,7 +95,7 @@ Item containerStack: Cura.MachineManager.activeMachine removeUnusedValue: false //Doesn't work with settings that are resolved. key: "adhesion_type" - watchedProperties: [ "value", "enabled" ] + watchedProperties: [ "value", "resolve", "enabled" ] storeIndex: 0 } } \ No newline at end of file