GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-13 02:19:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5719 from Ultimaker/CURA-6497_fix_empty_material_name

Browse Source 
CURA-6497 Add validation for empty strings in SettingDefinition
This commit is contained in:
Jaime van Kessel 2019-05-20 13:40:39 +02:00 committed by GitHub
commit fbc4c5fb1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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: if validator_type:
validator = validator_type(key) validator = validator_type(key)
validation_state = validator(stack) 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 # Finish
self._setResult(True) self._setResult(True)
return return

2
plugins/CuraEngineBackend/StartSliceJob.py
View File

@ -107,7 +107,7 @@ class StartSliceJob(Job):
for key in stack.getAllKeys(): for key in stack.getAllKeys():
validation_state = stack.getProperty(key, "validationState") 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) Logger.log("w", "Setting %s is not valid, but %s. Aborting slicing.", key, validation_state)
return True return True
Job.yieldThread() Job.yieldThread()

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

@ -42,6 +42,7 @@ SettingItem
} }
switch(propertyProvider.properties.validationState) switch(propertyProvider.properties.validationState)
{ {
case "ValidatorState.Invalid":
case "ValidatorState.Exception": case "ValidatorState.Exception":
case "ValidatorState.MinimumError": case "ValidatorState.MinimumError":
case "ValidatorState.MaximumError": case "ValidatorState.MaximumError":
@ -65,6 +66,7 @@ SettingItem
} }
switch(propertyProvider.properties.validationState) switch(propertyProvider.properties.validationState)
{ {
case "ValidatorState.Invalid":
case "ValidatorState.Exception": case "ValidatorState.Exception":
case "ValidatorState.MinimumError": case "ValidatorState.MinimumError":
case "ValidatorState.MaximumError": case "ValidatorState.MaximumError":