Skip to content

Commit b2d9ab6

Browse files
committed
[GraphEditor] Add "Interrupt/Cancel Job" menus
1 parent c22e40f commit b2d9ab6

File tree

1 file changed

+16
-2
lines changed

1 file changed

+16
-2
lines changed

meshroom/ui/qml/GraphEditor/GraphEditor.qml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -699,18 +699,32 @@ Item {
699699
}
700700
MenuItem {
701701
text: "Stop Computation"
702-
enabled: nodeMenu.currentNode.canBeStopped()
702+
enabled: nodeMenu.currentNode.canBeStopped() && nodeMenu.currentNode.globalExecMode == "LOCAL"
703703
visible: enabled
704704
height: visible ? implicitHeight : 0
705705
onTriggered: uigraph.stopNodeComputation(nodeMenu.currentNode)
706706
}
707707
MenuItem {
708708
text: "Cancel Computation"
709-
enabled: nodeMenu.currentNode.canBeCanceled()
709+
enabled: nodeMenu.currentNode.canBeCanceled() && nodeMenu.currentNode.globalExecMode == "LOCAL"
710710
visible: enabled
711711
height: visible ? implicitHeight : 0
712712
onTriggered: uigraph.cancelNodeComputation(nodeMenu.currentNode)
713713
}
714+
MenuItem {
715+
text: "Interrupt Job"
716+
enabled: nodeMenu.currentNode.canBeStopped() && nodeMenu.currentNode.globalExecMode == "EXTERN"
717+
visible: enabled
718+
height: visible ? implicitHeight : 0
719+
onTriggered: uigraph.stopNode(nodeMenu.currentNode)
720+
}
721+
MenuItem {
722+
text: "Cancel Job"
723+
enabled: nodeMenu.currentNode.canBeCanceled() && nodeMenu.currentNode.globalExecMode == "EXTERN"
724+
visible: enabled
725+
height: visible ? implicitHeight : 0
726+
onTriggered: uigraph.stopNode(nodeMenu.currentNode)
727+
}
714728
MenuItem {
715729
text: "Retry Error Tasks"
716730
enabled: nodeMenu.currentNode.globalExecMode == "EXTERN" && ["ERROR", "STOPPED", "KILLED"].includes(nodeMenu.currentNode.globalStatus)

0 commit comments

Comments
 (0)