From 20544139524ec1f675c5b7db26b8623fca7fe24c Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 9 May 2019 12:07:14 +0200 Subject: [PATCH 1/4] Add handling for ValidatorState.Invalid CURA-6497 ValidatorState.Invalid is set if a string setting has allow_empty = False and its value is empty. --- cura/Machines/MachineErrorChecker.py | 2 +- plugins/CuraEngineBackend/StartSliceJob.py | 2 +- resources/qml/Settings/SettingTextField.qml | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cura/Machines/MachineErrorChecker.py b/cura/Machines/MachineErrorChecker.py index fb11123af6..857f0bc1c4 100644 --- a/cura/Machines/MachineErrorChecker.py +++ b/cura/Machines/MachineErrorChecker.py @@ -168,7 +168,7 @@ class MachineErrorChecker(QObject): if validator_type: validator = validator_type(key) validation_state = validator(stack) - if validation_state in (ValidatorState.Exception, ValidatorState.MaximumError, ValidatorState.MinimumError): + if validation_state in (ValidatorState.Exception, ValidatorState.MaximumError, ValidatorState.MinimumError, ValidatorState.Invalid): # Finish self._setResult(True) return diff --git a/plugins/CuraEngineBackend/StartSliceJob.py b/plugins/CuraEngineBackend/StartSliceJob.py index 8ce3110a93..fc4de3dfa5 100644 --- a/plugins/CuraEngineBackend/StartSliceJob.py +++ b/plugins/CuraEngineBackend/StartSliceJob.py @@ -107,7 +107,7 @@ class StartSliceJob(Job): for key in stack.getAllKeys(): validation_state = stack.getProperty(key, "validationState") - if validation_state in (ValidatorState.Exception, ValidatorState.MaximumError, ValidatorState.MinimumError): + if validation_state in (ValidatorState.Exception, ValidatorState.MaximumError, ValidatorState.MinimumError, ValidatorState.Invalid): Logger.log("w", "Setting %s is not valid, but %s. Aborting slicing.", key, validation_state) return True Job.yieldThread() diff --git a/resources/qml/Settings/SettingTextField.qml b/resources/qml/Settings/SettingTextField.qml index 770ef53900..096f320a7c 100644 --- a/resources/qml/Settings/SettingTextField.qml +++ b/resources/qml/Settings/SettingTextField.qml @@ -42,6 +42,7 @@ SettingItem } switch(propertyProvider.properties.validationState) { + case "ValidatorState.Invalid": case "ValidatorState.Exception": case "ValidatorState.MinimumError": case "ValidatorState.MaximumError": @@ -65,6 +66,7 @@ SettingItem } switch(propertyProvider.properties.validationState) { + case "ValidatorState.Invalid": case "ValidatorState.Exception": case "ValidatorState.MinimumError": case "ValidatorState.MaximumError": From be05d07acda418c86a14f6778a4dff9a91ba5315 Mon Sep 17 00:00:00 2001 From: DragonJe <41123088+DragonJe@users.noreply.github.com> Date: Fri, 17 May 2019 11:26:54 -0500 Subject: [PATCH 2/4] Update nwa3d_a5_best.inst.cfg --- resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg index 8eabfa8141..5cd123aa19 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg @@ -14,7 +14,7 @@ global_quality = True layer_height = 0.08 layer_height_0 = 0.24 line_width = 0.4 -wall_line_width_0 = 100 +wall_line_width_0 = 0.4 initial_layer_line_width_factor = 100 wall_thickness = 0.8 wall_0_wipe_dist = 0.2 From 3fc956721571599af5577222d56ee5fffc03f2a3 Mon Sep 17 00:00:00 2001 From: DragonJe <41123088+DragonJe@users.noreply.github.com> Date: Fri, 17 May 2019 11:27:24 -0500 Subject: [PATCH 3/4] Update nwa3d_a5_fast.inst.cfg --- resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg index ae6411f4f1..9912ecb473 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg @@ -14,7 +14,7 @@ global_quality = True layer_height = 0.24 layer_height_0 = 0.24 line_width = 0.4 -wall_line_width_0 = 100 +wall_line_width_0 = 0.4 initial_layer_line_width_factor = 100 wall_thickness = 0.8 wall_0_wipe_dist = 0.2 From 864646d4a514b1de5ec5c50325ff77641d3666f6 Mon Sep 17 00:00:00 2001 From: DragonJe <41123088+DragonJe@users.noreply.github.com> Date: Fri, 17 May 2019 11:27:51 -0500 Subject: [PATCH 4/4] Update nwa3d_a5_normal.inst.cfg --- resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg index d825c8b85e..46e80c87b7 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg @@ -14,7 +14,7 @@ global_quality = True layer_height = 0.16 layer_height_0 = 0.24 line_width = 0.4 -wall_line_width_0 = 100 +wall_line_width_0 = 0.4 initial_layer_line_width_factor = 100 wall_thickness = 0.8 wall_0_wipe_dist = 0.2