3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 20:28:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch '4.1'

Browse source
This commit is contained in:
Ghostkeeper 2019-05-20 13:42:38 +02:00
commit 19cc267726
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
6 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/Machines/MachineErrorChecker.py
View file

@ -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

2
plugins/CuraEngineBackend/StartSliceJob.py
View file

@ -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()

2
resources/qml/Settings/SettingTextField.qml
View file

@ -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":

2
resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg
View file

@ -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

2
resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg
View file

@ -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

2
resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg
View file

@ -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