From 60cea34b853ea75758c3c2c1ed9f166343525be9 Mon Sep 17 00:00:00 2001
From: "Zheng, Lei" <realthunder.dev@gmail.com>
Date: Thu, 8 Feb 2024 13:19:37 -0500
Subject: [PATCH 1/2] Toponaming/Part: transfer in FeaturePartFuse

---
 src/Mod/Part/App/FeaturePartFuse.cpp | 36 ++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/src/Mod/Part/App/FeaturePartFuse.cpp b/src/Mod/Part/App/FeaturePartFuse.cpp
index 58df63f61b..874a1b0c1b 100644
--- a/src/Mod/Part/App/FeaturePartFuse.cpp
+++ b/src/Mod/Part/App/FeaturePartFuse.cpp
@@ -81,6 +81,7 @@ short MultiFuse::mustExecute() const
 
 App::DocumentObjectExecReturn *MultiFuse::execute()
 {
+#ifndef FC_USE_TNP_FIX
     std::vector<TopoDS_Shape> s;
     std::vector<App::DocumentObject*> obj = Shapes.getValues();
 
@@ -192,4 +193,39 @@ App::DocumentObjectExecReturn *MultiFuse::execute()
     }
 
     return App::DocumentObject::StdReturn;
+#else
+
+    std::vector<TopoShape> shapes;
+    for(auto obj : Shapes.getValues()) {
+        TopoShape sh = Feature::getTopoShape(obj);
+        if(sh.isNull())
+            return new App::DocumentObjectExecReturn("Input shape is null");
+        if(!sh.hasSubShape(TopAbs_SOLID)) {
+            if(FC_LOG_INSTANCE.isEnabled(FC_LOGLEVEL_LOG))
+                FC_WARN("fusion of non solid: " << obj->getFullName());
+            else
+                FC_MSG("fusion of non solid: " << obj->getFullName());
+        }
+        shapes.push_back(sh);
+    }
+
+    TopoShape res(0,getDocument()->getStringHasher());
+    res.makEBoolean(Part::OpCodes::Fuse,shapes);
+    if (res.isNull())
+        throw Base::RuntimeError("Resulting shape is null");
+
+    Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
+                                             .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/Part/Boolean");
+    if (hGrp->GetBool("CheckModel", false)) {
+        BRepCheck_Analyzer aChecker(res.getShape());
+        if (! aChecker.IsValid() ) {
+            return new App::DocumentObjectExecReturn("Resulting shape is invalid");
+        }
+    }
+
+    if (this->Refine.getValue())
+        res = res.makERefine();
+    this->Shape.setValue(res);
+    return Part::Feature::execute();
+#endif
 }

From d815ac9341f4dcfe399874a3e30deb7af37722a9 Mon Sep 17 00:00:00 2001
From: bgbsww <bgbsww@gmail.com>
Date: Thu, 8 Feb 2024 13:57:16 -0500
Subject: [PATCH 2/2] Toponaming/Part: Clean up code

---
 src/Mod/Part/App/FeaturePartFuse.cpp | 38 ++++++++++++++++++----------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/Mod/Part/App/FeaturePartFuse.cpp b/src/Mod/Part/App/FeaturePartFuse.cpp
index 874a1b0c1b..cec34e5b87 100644
--- a/src/Mod/Part/App/FeaturePartFuse.cpp
+++ b/src/Mod/Part/App/FeaturePartFuse.cpp
@@ -31,11 +31,14 @@
 #endif
 
 #include <App/Application.h>
+#include <Base/Console.h>
 #include <Base/Parameter.h>
 
 #include "FeaturePartFuse.h"
+#include "TopoShapeOpCode.h"
 #include "modelRefine.h"
 
+FC_LOG_LEVEL_INIT("Part",true,true);
 
 using namespace Part;
 
@@ -194,37 +197,44 @@ App::DocumentObjectExecReturn *MultiFuse::execute()
 
     return App::DocumentObject::StdReturn;
 #else
-
     std::vector<TopoShape> shapes;
-    for(auto obj : Shapes.getValues()) {
+    for (auto obj : Shapes.getValues()) {
         TopoShape sh = Feature::getTopoShape(obj);
-        if(sh.isNull())
+        if (sh.isNull()) {
             return new App::DocumentObjectExecReturn("Input shape is null");
-        if(!sh.hasSubShape(TopAbs_SOLID)) {
-            if(FC_LOG_INSTANCE.isEnabled(FC_LOGLEVEL_LOG))
+        }
+        if (!sh.hasSubShape(TopAbs_SOLID)) {
+            if (FC_LOG_INSTANCE.isEnabled(FC_LOGLEVEL_LOG)) {
                 FC_WARN("fusion of non solid: " << obj->getFullName());
-            else
+            }
+            else {
                 FC_MSG("fusion of non solid: " << obj->getFullName());
+            }
         }
         shapes.push_back(sh);
     }
 
-    TopoShape res(0,getDocument()->getStringHasher());
-    res.makEBoolean(Part::OpCodes::Fuse,shapes);
-    if (res.isNull())
+    TopoShape res(0);
+    res.makeElementBoolean(Part::OpCodes::Fuse, shapes);
+    if (res.isNull()) {
         throw Base::RuntimeError("Resulting shape is null");
+    }
 
-    Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
-                                             .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/Part/Boolean");
+    Base::Reference<ParameterGrp> hGrp = App::GetApplication()
+                                             .GetUserParameter()
+                                             .GetGroup("BaseApp")
+                                             ->GetGroup("Preferences")
+                                             ->GetGroup("Mod/Part/Boolean");
     if (hGrp->GetBool("CheckModel", false)) {
         BRepCheck_Analyzer aChecker(res.getShape());
-        if (! aChecker.IsValid() ) {
+        if (!aChecker.IsValid()) {
             return new App::DocumentObjectExecReturn("Resulting shape is invalid");
         }
     }
 
-    if (this->Refine.getValue())
-        res = res.makERefine();
+    if (this->Refine.getValue()) {
+        res = res.makeElementRefine();
+    }
     this->Shape.setValue(res);
     return Part::Feature::execute();
 #endif