From bd406dbcfd2d05f104d3c388c7d29f2d8d5e8442 Mon Sep 17 00:00:00 2001
From: bgbsww <bgbsww@gmail.com>
Date: Thu, 11 Apr 2024 12:16:04 -0400
Subject: [PATCH] TopoNaming/PartDesign: Implement shapebinders

---
 src/Mod/PartDesign/App/ShapeBinder.cpp        | 37 +++++++++++++++++--
 .../TestTopologicalNamingProblem.py           | 31 ++++++++++++++++
 2 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/src/Mod/PartDesign/App/ShapeBinder.cpp b/src/Mod/PartDesign/App/ShapeBinder.cpp
index 730ba735ce..4ee4c28125 100644
--- a/src/Mod/PartDesign/App/ShapeBinder.cpp
+++ b/src/Mod/PartDesign/App/ShapeBinder.cpp
@@ -692,7 +692,11 @@ void SubShapeBinder::update(SubShapeBinder::UpdateOption options) {
         else {
             for (size_t i = 0; i < shapes.size(); ++i) {
                 auto& shape = shapes[i];
+#ifdef FC_USE_TNP_FIX
+                shape = shape.makeElementTransform(*shapeMats[i]);
+#else
                 shape = shape.makeTransform(*shapeMats[i]);
+#endif
                 // if(shape.Hasher
                 //         && shape.getElementMapSize()
                 //         && shape.Hasher != getDocument()->getStringHasher())
@@ -707,9 +711,11 @@ void SubShapeBinder::update(SubShapeBinder::UpdateOption options) {
             // Shape.resetElementMapVersion();
             return;
         }
-
+#ifdef FC_USE_TNP_FIX
+        result.makeElementCompound(shapes);
+#else
         result.makeCompound(shapes);
-
+#endif
         bool fused = false;
         if (Fuse.getValue()) {
             // If the compound has solid, fuse them together, and ignore other type of
@@ -728,7 +734,11 @@ void SubShapeBinder::update(SubShapeBinder::UpdateOption options) {
             }
             else if (!solid.isNull()) {
                 // wrap the single solid in compound to keep its placement
+#ifdef FC_USE_TNP_FIX
+                result.makeElementCompound({ solid });
+#else
                 result.makeCompound({ solid });
+#endif
                 fused = true;
             }
         }
@@ -737,6 +747,15 @@ void SubShapeBinder::update(SubShapeBinder::UpdateOption options) {
             && !result.hasSubShape(TopAbs_FACE)
             && result.hasSubShape(TopAbs_EDGE))
         {
+#ifdef FC_USE_TNP_FIX
+            result = result.makeElementWires();
+            if (MakeFace.getValue()) {
+                try {
+                    result = result.makeElementFace(nullptr);
+                }
+                catch (...) {}
+            }
+#else
             result = result.makeWires();
             if (MakeFace.getValue()) {
                 try {
@@ -744,16 +763,25 @@ void SubShapeBinder::update(SubShapeBinder::UpdateOption options) {
                 }
                 catch (...) {}
             }
+#endif
         }
 
         if (!fused && result.hasSubShape(TopAbs_WIRE)
             && Offset.getValue() != 0.0) {
             try {
+#ifdef FC_USE_TNP_FIX
+                result = result.makeElementOffset2D(Offset.getValue(),
+                                             (Part::JoinType) OffsetJoinType.getValue() ,
+                                             OffsetFill.getValue() ? Part::FillType::fill : Part::FillType::noFill,
+                                             OffsetOpenResult.getValue() ? Part::OpenResult::allowOpenResult : Part::OpenResult::noOpenResult,
+                                             OffsetIntersection.getValue());
+#else
                 result = result.makeOffset2D(Offset.getValue(),
                                              OffsetJoinType.getValue(),
                                              OffsetFill.getValue(),
                                              OffsetOpenResult.getValue(),
                                              OffsetIntersection.getValue());
+#endif
             }
             catch (...) {
                 std::ostringstream msg;
@@ -763,8 +791,11 @@ void SubShapeBinder::update(SubShapeBinder::UpdateOption options) {
         }
 
         if (Refine.getValue())
+#ifdef FC_USE_TNP_FIX
+            result = result.makeElementRefine();
+#else
             result = result.makeRefine();
-
+#endif
         result.setPlacement(Placement.getValue());
         Shape.setValue(result);
     }
diff --git a/src/Mod/PartDesign/PartDesignTests/TestTopologicalNamingProblem.py b/src/Mod/PartDesign/PartDesignTests/TestTopologicalNamingProblem.py
index d4d465c425..ced5f713b4 100644
--- a/src/Mod/PartDesign/PartDesignTests/TestTopologicalNamingProblem.py
+++ b/src/Mod/PartDesign/PartDesignTests/TestTopologicalNamingProblem.py
@@ -627,6 +627,37 @@ class TestTopologicalNamingProblem(unittest.TestCase):
     def testPartDesignElementMapSubHelix(self):
         pass  # TODO
 
+    def testPartDesignElementMapShapeBinder(self):
+        # Arrange
+        body = self.Doc.addObject('PartDesign::Body', 'Body')
+        box = self.Doc.addObject('PartDesign::AdditiveBox', 'Box')
+        shapebinder = self.Doc.addObject('PartDesign::ShapeBinder', 'ShapeBinder')
+        if body.Shape.ElementMapVersion == "":   # Skip without element maps.
+            return
+        # Act / Assert
+        body.addObject(box)
+        body.addObject(shapebinder)
+        shapebinder.Support = [box]
+        self.Doc.recompute()
+        self.assertEqual(len(shapebinder.Shape.childShapes()), 1)
+        self.assertEqual(shapebinder.Shape.childShapes()[0].ElementMapSize, 26)
+
+    def testPartDesignElementMapSubShapeBinder(self):
+        # Arrange
+        body = self.Doc.addObject('PartDesign::Body', 'Body')
+        box = self.Doc.addObject('PartDesign::AdditiveBox', 'Box')
+        subshapebinder = self.Doc.addObject('PartDesign::SubShapeBinder', 'SubShapeBinder')
+        if body.Shape.ElementMapVersion == "":   # Skip without element maps.
+            return
+        # Act / Assert
+        body.addObject(box)
+        body.addObject(subshapebinder)
+        subshapebinder.Support = [ (box, ["Face1"]) ]
+        self.assertEqual(len(body.Shape.childShapes()), 0)
+        self.Doc.recompute()
+        self.assertEqual(len(body.Shape.childShapes()), 1)
+        self.assertEqual(subshapebinder.Shape.childShapes()[0].ElementMapSize, 9)
+
     def testSketchElementMap(self):
         body = self.Doc.addObject('PartDesign::Body', 'Body')
         sketch = self.Doc.addObject('Sketcher::SketchObject', 'Sketch')