[ui] Add stoppable state for the Submit button

When a job has been submitted, the state of the `Submit` button switches
to `stoppable`. Clicking it in this state interrupts the node's computation
on the farm.

Author: cbentejac

meshroom/ui/qml/Controls/NodeActions.qml

@@ -18,10 +18,11 @@ Item {
     property var nodeRepeater: null  // Reference to nodeRepeater to find delegates
 
     // Signals
-    signal computeRequest(var node)
-    signal stopComputeRequest(var node)
-    signal deleteDataRequest(var node)
-    signal submitRequest(var node)
+    signal computeRequest(var node)      // Start local computation
+    signal stopComputeRequest(var node)  // Stop local computation
+    signal deleteDataRequest(var node)   // Delete node data
+    signal submitRequest(var node)       // Start external computation (submission on farm)
+    signal stopSubmitRequest(var node)   // Stop external computation (interrupt tasks on farm)
 
     SystemPalette { id: activePalette }
 
@@ -120,7 +121,26 @@ Item {
                 default: return MaterialIcons.send
             }
         }
+        property string computeButtonTooltip: {
+            switch (computeButtonState) {
+                case NodeActions.ButtonState.STOPPABLE: return "Stop Compute"
+                default: return "Start Compute"
+            }
+        }
+
         property int submitButtonState: NodeActions.ButtonState.LAUNCHABLE
+        property string submitButtonIcon: {
+            switch (submitButtonState) {
+                case NodeActions.ButtonState.STOPPABLE: return MaterialIcons.paragliding
+                default: return MaterialIcons.rocket_launch
+            }
+        }
+        property string submitButtonTooltip: {
+            switch (submitButtonState) {
+                case NodeActions.ButtonState.STOPPABLE: return "Interrupt Job on Render Farm"
+                default: return "Submit on Render Farm"
+            }
+        }
 
         function getComputeButtonState(node) {
             if (actionHeader.canStopNode)
@@ -133,10 +153,10 @@ Item {
         }
 
         function getSubmitButtonState(node) {
-            if (actionHeader.nodeIsLocked || actionHeader.canStopNode)
-                return NodeActions.ButtonState.DISABLED
+            if (actionHeader.canStopNode)
+                return NodeActions.ButtonState.STOPPABLE
             if (!actionHeader.nodeIsLocked && node.globalStatus == "SUCCESS")
-                return NodeActions.ButtonState.DISABLED
+                return NodeActions.ButtonState.DELETABLE
             if (actionHeader.canSubmitNode)
                 return NodeActions.ButtonState.LAUNCHABLE
             return NodeActions.ButtonState.DISABLED
@@ -205,13 +225,13 @@ Item {
                 font.pointSize: 16
                 text: actionHeader.computeButtonIcon
                 padding: 6
-                ToolTip.text: "Start/Stop/Restart Compute"
+                ToolTip.text: actionHeader.computeButtonTooltip
                 ToolTip.visible: hovered
                 ToolTip.delay: 1000
                 visible: actionHeader.computeButtonState != NodeActions.ButtonState.DELETABLE
-                enabled: actionHeader.computeButtonState % 2 == 1  // Launchable & Stoppable
+                enabled: actionHeader.computeButtonState % 2 == 1 && !actionHeader.nodeSubmitted // Launchable & Stoppable, local
                 // Icon color
-                textColor: (!enabled && actionHeader.nodeSubmitted) ? Colors.statusColors["SUBMITTED"] : (checked ? palette.highlight : palette.text)
+                textColor: checked ? palette.highlight : palette.text
                 // Background color
                 background: Rectangle {
                     color: {
@@ -244,7 +264,7 @@ Item {
                 font.pointSize: 16
                 text: MaterialIcons.delete_
                 padding: 6
-                ToolTip.text: "Delete data"
+                ToolTip.text: "Delete Data"
                 ToolTip.visible: hovered
                 ToolTip.delay: 1000
                 visible: actionHeader.canRestartNode || actionHeader.computeButtonState == NodeActions.ButtonState.DELETABLE
@@ -265,20 +285,23 @@ Item {
             MaterialToolButton {
                 id: submitButton
                 font.pointSize: 16
-                text: MaterialIcons.rocket_launch
+                text: actionHeader.submitButtonIcon
                 padding: 6
-                ToolTip.text: "Submit on Render Farm"
+                ToolTip.text: actionHeader.submitButtonTooltip
                 ToolTip.visible: hovered
                 ToolTip.delay: 1000
-                visible: root.uigraph ? root.uigraph.canSubmit : false
-                enabled: actionHeader.submitButtonState != NodeActions.ButtonState.DISABLED
+                visible: actionHeader.submitButtonState != NodeActions.ButtonState.DELETABLE
+                enabled: actionHeader.submitButtonState % 2 == 1 && (actionHeader.nodeSubmitted || !actionHeader.nodeIsLocked)  // Launchable & Stoppable, external
                 // Icon color
-                textColor: (!enabled && actionHeader.nodeSubmitted) ? Colors.statusColors["SUBMITTED"] : (checked ? palette.highlight : palette.text)
+                textColor: checked ? palette.highlight : palette.text
                 // Background color
                 background: Rectangle {
                     color: {
                         if (!submitButton.enabled)
                             return activePalette.button
+
+                        if (actionHeader.submitButtonState == NodeActions.ButtonState.STOPPABLE)
+                            return submitButton.hovered ? Colors.orange : Qt.darker(Colors.orange, 1.3)
                         return submitButton.hovered ? activePalette.highlight : activePalette.button
                     }
                     opacity: submitButton.hovered ? 1 : root._opacity
@@ -287,8 +310,16 @@ Item {
                     radius: 3
                 }
                 onClicked: {
-                    if (actionHeader.selectedNode) {
-                        root.submitRequest(actionHeader.selectedNode)
+                    switch (actionHeader.submitButtonState) {
+                        case NodeActions.ButtonState.STOPPABLE:
+                            root.stopSubmitRequest(actionHeader.selectedNode)
+                            break
+                        case NodeActions.ButtonState.LAUNCHABLE:
+                            root.submitRequest(actionHeader.selectedNode)
+                            actionHeader.updateProperties(actionHeader.selectedNode)
+                            break
+                        default:
+                            break
                     }
                 }
             }

meshroom/ui/qml/GraphEditor/GraphEditor.qml

@@ -1093,14 +1093,21 @@ Item {
                 uigraph.cancelNodeComputation(node)
             }
         }
-        
+
         onDeleteDataRequest: function(node) {
-            uigraph.clearSelectedNodesData();
+            uigraph.clearSelectedNodesData()
         }
 
         onSubmitRequest: function(node) {
             root.submitRequest([node])
         }
+
+        onStopSubmitRequest: function(node) {
+            if (node.canBeStopped() || node.canBeCanceled()) {
+                uigraph.stopNode(node)
+            }
+        }
+
     }
 
     MessageDialog {