when crating/pasting nodes, only use a different name if necessary

closes #755
NatronGitHub · Jan 20, 2022 · fca2be3 · fca2be3
1 parent ba72633
commit fca2be3
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 46 deletions.
diff --git a/Engine/NodeName.cpp b/Engine/NodeName.cpp
@@ -63,21 +63,24 @@ Node::initNodeScriptName(const NodeSerialization* serialization, const QString&
 
     if (!fixedName.isEmpty()) {
 
-        std::string baseName = fixedName.toStdString();
-        trimNumber(baseName);
-        std::string name;
-        int no = 1;
-        do {
-            name = baseName;
-            if (no > 1) {
-                name += '_';
-                std::stringstream ss;
-                ss << no;
-                name += ss.str();
-            }
-            ++no;
-        } while ( group && group->checkIfNodeNameExists(name, this) );
-
+        std::string name = fixedName.toStdString();
+        // If the script name is available, use it as is (else we get issue #755).
+        // Else look for a similar name by adding a (different) number suffix.
+        if ( group && group->checkIfNodeNameExists(name, this) ) {
+            std::string baseName = name;
+            trimNumber(baseName);
+            int no = 1;
+            do {
+                name = baseName;
+                if (no > 1) {
+                    name += '_';
+                    std::stringstream ss;
+                    ss << no;
+                    name += ss.str();
+                }
+                ++no;
+            } while ( group && group->checkIfNodeNameExists(name, this) );
+        }
         //This version of setScriptName will not error if the name is invalid or already taken
         setScriptName_no_error_check(name);
 
@@ -86,20 +89,24 @@ Node::initNodeScriptName(const NodeSerialization* serialization, const QString&
             QMutexLocker k(&_imp->nameMutex);
             _imp->cacheID = serialization->getCacheID();
         }
-        std::string baseName = serialization->getNodeScriptName();
-        trimNumber(baseName);
-        std::string name;
-        int no = 1;
-        do {
-            name = baseName;
-            if (no > 1) {
-                name += '_';
-                std::stringstream ss;
-                ss << no;
-                name += ss.str();
-            }
-            ++no;
-        } while ( group && group->checkIfNodeNameExists(name, this) );
+        std::string name = serialization->getNodeScriptName();
+        // If the serialized script name is available, use it as is (else we get issue #755).
+        // Else look for a similar name by adding a (different) number suffix.
+        if ( group && group->checkIfNodeNameExists(name, this) ) {
+            std::string baseName = name;
+            trimNumber(baseName);
+            int no = 1;
+            do {
+                name = baseName;
+                if (no > 1) {
+                    name += '_';
+                    std::stringstream ss;
+                    ss << no;
+                    name += ss.str();
+                }
+                ++no;
+            } while ( group->checkIfNodeNameExists(name, this) );
+        }
 
         //This version of setScriptName will not error if the name is invalid or already taken
         setScriptName_no_error_check(name);

diff --git a/Gui/NodeGraphPrivate10.cpp b/Gui/NodeGraphPrivate10.cpp
@@ -189,24 +189,26 @@ NodeGraphPrivate::pasteNode(const NodeSerializationPtr & internalSerialization,
     NodeGuiPtr gui = boost::dynamic_pointer_cast<NodeGui>(gui_i);
     assert(gui);
 
-    std::string name;
     if ( ( grp == group.lock() ) && ( !internalSerialization->getNode() || ( internalSerialization->getNode()->getGroup() == group.lock() ) ) ) {
-        //We pasted the node in the same group, give it another label
-        std::string baseName = internalSerialization->getNodeLabel();
-        trimNumber(baseName);
-        std::string name;
-        int no = 1;
-        do {
-            name = baseName;
-            if (no > 1) {
-                name += '_';
-                std::stringstream ss;
-                ss << no;
-                name += ss.str();
-            }
-            ++no;
-        } while ( grp->checkIfNodeLabelExists( name, n.get() ) );
-
+        // We pasted the node in the same group, give it another label.
+        // If the label is available, use it as is.
+        // Else look for a similar name by adding a (different) number suffix.
+        std::string name = internalSerialization->getNodeLabel();
+        if ( grp->checkIfNodeLabelExists( name, n.get() ) ) {
+            std::string baseName = name;
+            trimNumber(baseName);
+            int no = 1;
+            do {
+                name = baseName;
+                if (no > 1) {
+                    name += '_';
+                    std::stringstream ss;
+                    ss << no;
+                    name += ss.str();
+                }
+                ++no;
+            } while ( grp->checkIfNodeLabelExists( name, n.get() ) );
+        }
         n->setLabel(name);
     } else {
         //If we paste the node in a different graph, it can keep its scriptname/label