3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-08-03 08:48:40 +02:00
Code Issues Projects Releases Packages Wiki Activity

[ui] GraphEditor: check sessionUid for stop/cancel computation

Browse source
This commit is contained in:
Julien-Haudegond 2020-08-26 15:33:45 +02:00
parent 32a7005928
commit a00c82cd2f
2 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
meshroom/ui/qml/GraphEditor/GraphEditor.qml
View file

@ -294,10 +294,12 @@ Item {
enabled: {
if(!nodeMenu.currentNode)
return false
// Only locked nodes running in local can be stopped
// Only locked nodes running in local with the same sessionUid
// as the Meshroom instance can be stopped
return nodeMenu.currentNode.locked &&
nodeMenu.currentNode.globalStatus === "RUNNING" &&
nodeMenu.currentNode.globalExecMode === "LOCAL"
nodeMenu.currentNode.globalExecMode === "LOCAL" &&
nodeMenu.currentNode.statusInThisSession()
}
visible: enabled
height: visible ? implicitHeight : 0
@ -308,10 +310,12 @@ Item {
enabled: {
if(!nodeMenu.currentNode)
return false
// Only locked nodes submitted in local can be canceled
// Only locked nodes submitted in local with the same sessionUid
// as the Meshroom instance can be canceled
return nodeMenu.currentNode.locked &&
nodeMenu.currentNode.globalStatus === "SUBMITTED" &&
nodeMenu.currentNode.globalExecMode === "LOCAL"
nodeMenu.currentNode.globalExecMode === "LOCAL" &&
nodeMenu.currentNode.statusInThisSession()
}
visible: enabled
height: visible ? implicitHeight : 0