Part/Toponaming: Refactor makeElementCompound

Refactor to address linter issues, breaking up large methods, renaming variables, etc.
chennes · Jan 15, 2024 · 778c3ea · 778c3ea
1 parent ab6055a
commit 778c3ea
Show file tree

Hide file tree

Showing 4 changed files with 345 additions and 147 deletions.
diff --git a/src/App/ComplexGeoData.cpp b/src/App/ComplexGeoData.cpp
@@ -185,7 +185,7 @@ bool ComplexGeoData::getCenterOfGravity(Base::Vector3d& unused) const
 }
 
 const std::string &ComplexGeoData::elementMapPrefix() {
-    static std::string prefix(";");
+    static std::string prefix(ELEMENT_MAP_PREFIX);
     return prefix;
 }
 

diff --git a/src/Mod/Part/App/TopoShape.h b/src/Mod/Part/App/TopoShape.h
@@ -451,7 +451,7 @@ class PartExport TopoShape : public Data::ComplexGeoData
     //                                      double tol=1e-7, double atol=1e-12) const;
     //@}
 
-    void copyElementMap(const TopoShape &other, const char *op=nullptr);
+    void copyElementMap(const TopoShape & topoShape, const char *op=nullptr);
     bool canMapElement(const TopoShape &other) const;
     void mapSubElement(const TopoShape &other,const char *op=nullptr, bool forceHasher=false);
     void mapSubElement(const std::vector<TopoShape> &shapes, const char *op);
@@ -484,6 +484,26 @@ class PartExport TopoShape : public Data::ComplexGeoData
 
 private:
     TopoDS_Shape _Shape;
+
+private:
+    // Helper methods
+    static std::vector<Data::ElementMap::MappedChildElements>
+    createChildMap(size_t count, const std::vector<TopoShape>& shapes, const char* op);
+
+    void setupChild(Data::ElementMap::MappedChildElements& child,
+                    TopAbs_ShapeEnum elementType,
+                    const TopoShape& topoShape,
+                    size_t shapeCount,
+                    const char* op);
+    void mapSubElementForShape(const TopoShape& other, const char* op);
+    void mapSubElementTypeForShape(const TopoShape& other,
+                                   TopAbs_ShapeEnum type,
+                                   const char* op,
+                                   int count,
+                                   bool forward,
+                                   bool& warned);
+    void mapCompoundSubElements(const std::vector<TopoShape>& shapes, const char* op);
+
 };
 
 } //namespace Part