[graph] Prevent several bugs in the node rename feature

Author: Alxiice

meshroom/ui/graph.py

@@ -2,6 +2,7 @@
 from collections.abc import Iterable
 import logging
 import os
+import re
 import json
 from enum import Enum
 from threading import Thread, Event, Lock
@@ -936,6 +937,11 @@ def addNewNode(self, nodeType, position=None, **kwargs):
 
     @Slot(Node, str, result=str)
     def renameNode(self, node, newName):
+        newName = "_".join(newName.split("_")[:-1]) if "_" in newName else newName
+        # Eliminate all characters except digits and letters
+        newName = re.sub(r"[^0-9a-zA-Z]", "", newName)
+        if not newName:
+            return ""
         return self.push(commands.RenameNodeCommand(self._graph, node, newName))
 
     def moveNode(self, node: Node, position: Position):

meshroom/ui/qml/GraphEditor/NodeEditor.qml

@@ -85,8 +85,13 @@ Panel {
     function validateNodeNameChange(name) {
         if (root.node && name.trim() !== "") {
             const newNodeName = _reconstruction.renameNode(_reconstruction.selectedNode, name.trim())
-            root.displayNodeName = newNodeName
-            root.validatedNodeName = newNodeName
+            if (newNodeName == "") {
+                root.displayNodeName = root.nodeName
+                root.validatedNodeName = root.nodeName
+            } else {
+                root.displayNodeName = newNodeName
+                root.validatedNodeName = newNodeName
+            }
         }
     }
     function cancelNodeNameChange() {
@@ -110,6 +115,7 @@ Panel {
                 id: nodeNameField
                 visible: root.node !== null
                 text: root.displayNodeName
+                validator: RegularExpressionValidator { regularExpression: /^[0-9A-Za-z]+$/ }
                 font.bold: true
                 readOnly: true
                 selectByMouse: false
@@ -125,6 +131,10 @@ Panel {
                     radius: 2
                 }
 
+                function refreshText() {
+                    nodeNameField.text = Qt.binding(function() { return root.displayNodeName })
+                }
+
                 MouseArea {
                     anchors.fill: parent
                     enabled: nodeNameField.readOnly
@@ -141,6 +151,7 @@ Panel {
                 Keys.onReturnPressed: {
                     if (!readOnly) {
                         root.validateNodeNameChange(text)
+                        nodeNameField.refreshText()
                         readOnly = true
                         selectByMouse = false
                     }
@@ -149,6 +160,7 @@ Panel {
                 Keys.onEnterPressed: {
                     if (!readOnly) {
                         root.validateNodeNameChange(text)
+                        nodeNameField.refreshText()
                         readOnly = true
                         selectByMouse = false
                     }
@@ -157,6 +169,7 @@ Panel {
                 Keys.onEscapePressed: {
                     if (!readOnly) {
                         root.cancelNodeNameChange()
+                        nodeNameField.refreshText()
                         readOnly = true
                         selectByMouse = false
                     }
@@ -166,10 +179,23 @@ Panel {
                     if (!activeFocus && !readOnly) {
                         // Focus lost without pressing Enter - discard changes
                         root.cancelNodeNameChange()
+                        nodeNameField.refreshText()
                         readOnly = true
                         selectByMouse = false
                     }
                 }
+
+                Connections {
+                    target: _reconstruction
+                    function onSelectedNodeChanged() {
+                        if (!activeFocus && !readOnly) {
+                            root.cancelNodeNameChange()
+                            nodeNameField.refreshText()
+                            nodeNameField.readOnly = true
+                            nodeNameField.selectByMouse = false
+                        }
+                    }
+                }
             }
 
             // Show node type if the node name does not start with "nodeType_"