GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 22:29:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'CURA-6497_fix_empty_material_name' of github.com:Ultimaker/Cura into 4.1

Browse Source
This commit is contained in:
Jaime van Kessel 2019-05-20 13:38:37 +02:00
commit 5ae103964a
3 changed files with 4 additions and 2 deletions
Show Stats 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":