[ui] NodeActions: disable submit when the node isn't cleared first

Author: Alxiice

meshroom/ui/graph.py

@@ -1173,7 +1173,7 @@ def pasteNodes(self, serializedData: str, position: Optional[QPoint]=None) -> li
     @Slot(Node, result=bool)
     def canComputeNode(self, node: Node) -> bool:
         """ Check if the node can be computed """
-        if node.isCompatibilityNode or not node.isComputableType:
+        if node.isCompatibilityNode or not node.isComputableType or node.getLocked():
             return False
         if node.isComputed:
             return True
@@ -1184,7 +1184,7 @@ def canComputeNode(self, node: Node) -> bool:
     @Slot(Node, result=bool)
     def canSubmitNode(self, node: Node) -> bool:
         """ Check if the node can be submitted """
-        if node.isCompatibilityNode or not node.isComputableType:
+        if node.isCompatibilityNode or not node.isComputableType or node.getLocked():
             return False
         if node.isComputed:
             return True

meshroom/ui/qml/Controls/NodeActions.qml

@@ -125,19 +125,19 @@ Item {
         function getComputeButtonState(node) {
             if (actionHeader.canStopNode)
                 return NodeActions.ButtonState.STOPPABLE
-            if (!actionHeader.nodeIsLocked) {
-                if (node.globalStatus == "SUCCESS")
-                    return NodeActions.ButtonState.DELETABLE
-                if (actionHeader.canComputeNode)
-                    return NodeActions.ButtonState.LAUNCHABLE
-            } 
+            if (!actionHeader.nodeIsLocked && node.globalStatus == "SUCCESS")
+                return NodeActions.ButtonState.DELETABLE
+            if (actionHeader.canComputeNode)
+                return NodeActions.ButtonState.LAUNCHABLE
             return NodeActions.ButtonState.DISABLED
         }
 
         function getSubmitButtonState(node) {
             if (actionHeader.nodeIsLocked || actionHeader.canStopNode)
                 return NodeActions.ButtonState.DISABLED
-            if (!actionHeader.nodeIsLocked && actionHeader.canSubmitNode)
+            if (!actionHeader.nodeIsLocked && node.globalStatus == "SUCCESS")
+                return NodeActions.ButtonState.DISABLED
+            if (actionHeader.canSubmitNode)
                 return NodeActions.ButtonState.LAUNCHABLE
             return NodeActions.ButtonState.DISABLED
         }
@@ -240,7 +240,7 @@ Item {
 
             // Clear node
             MaterialToolButton {
-                id: restartButton
+                id: deleteDataButton
                 font.pointSize: 16
                 text: MaterialIcons.delete_
                 padding: 6

meshroom/ui/qml/GraphEditor/GraphEditor.qml

@@ -1099,7 +1099,6 @@ Item {
         }
 
         onSubmitRequest: function(node) {
-            if (node.isComputed) uigraph.clearSelectedNodesData();
             root.submitRequest([node])
         }
     }