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

Check if options are available before matching on them

Browse Source 
This prevents a QML warning when the ListModel is created before the property provider is. This QML warning looked like this:
2020-03-20 15:04:30,012 - WARNING - [MainThread] UM.Qt.QtApplication.__onQmlWarning [406]: file:///home/trin/Gedeeld/Projects/Cura/cura/../resources/qml/MachineSettings/ComboBoxWithOptions.qml:74: TypeError: Cannot call method 'match' of undefined

Done during Turbo Testing and Tooling.
This commit is contained in:
Ghostkeeper 2020-03-20 15:09:46 +01:00
parent 5cfe71e516
commit 31aee866f4
No known key found for this signature in database
GPG Key ID: D2A8871EE34EC59A
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
resources/qml/MachineSettings/ComboBoxWithOptions.qml
View File

@ -1,4 +1,4 @@
// Copyright (c) 2019 Ultimaker B.V. // Copyright (c) 2020 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10 import QtQuick 2.10
@ -71,14 +71,17 @@ UM.TooltipArea
{ {
clear() clear()
// Options come in as a string-representation of an OrderedDict // Options come in as a string-representation of an OrderedDict
var options = propertyProvider.properties.options.match(/^OrderedDict\(\[\((.*)\)\]\)$/) if(propertyProvider.properties.options)
if (options)
{ {
options = options[1].split("), (") var options = propertyProvider.properties.options.match(/^OrderedDict\(\[\((.*)\)\]\)$/);
for (var i = 0; i < options.length; i++) if(options)
{ {
var option = options[i].substring(1, options[i].length - 1).split("', '") options = options[1].split("), (");
append({ text: option[1], value: option[0] }) for(var i = 0; i < options.length; i++)
{
var option = options[i].substring(1, options[i].length - 1).split("', '");
append({ text: option[1], value: option[0] });
}
} }
} }
} }

2
resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml
View File

@ -1,4 +1,4 @@
// Copyright (c) 2019 Ultimaker B.V. // Copyright (c) 2020 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10 import QtQuick 2.10