diff --git a/src/Mod/Part/App/TopoShapeMapper.cpp b/src/Mod/Part/App/TopoShapeMapper.cpp index 89ea456a40..69f9653d18 100644 --- a/src/Mod/Part/App/TopoShapeMapper.cpp +++ b/src/Mod/Part/App/TopoShapeMapper.cpp @@ -3,73 +3,95 @@ namespace Part { -void ShapeMapper::expand(const TopoDS_Shape &d, std::vector &shapes) +void ShapeMapper::expand(const TopoDS_Shape& d, std::vector& shapes) { - if (d.IsNull()) return; - for(TopExp_Explorer xp(d, TopAbs_FACE);xp.More();xp.Next()) - shapes.push_back(xp.Current()); - for(TopExp_Explorer xp(d, TopAbs_EDGE, TopAbs_FACE);xp.More();xp.Next()) - shapes.push_back(xp.Current()); - for(TopExp_Explorer xp(d, TopAbs_VERTEX, TopAbs_EDGE);xp.More();xp.Next()) - shapes.push_back(xp.Current()); -} - -void ShapeMapper::populate(bool generated, - const TopTools_ListOfShape &src, - const TopTools_ListOfShape &dst) -{ - for(TopTools_ListIteratorOfListOfShape it(src);it.More();it.Next()) - populate(generated, it.Value(), dst); -} - -void ShapeMapper::populate(bool generated, - const TopoShape &src, - const TopTools_ListOfShape &dst) -{ - if(src.isNull()) + if (d.IsNull()) { return; - std::vector dstShapes; - for(TopTools_ListIteratorOfListOfShape it(dst);it.More();it.Next()) - expand(it.Value(), dstShapes); - insert(generated, src.getShape(), dstShapes); + } + for (TopExp_Explorer xp(d, TopAbs_FACE); xp.More(); xp.Next()) { + shapes.push_back(xp.Current()); + } + for (TopExp_Explorer xp(d, TopAbs_EDGE, TopAbs_FACE); xp.More(); xp.Next()) { + shapes.push_back(xp.Current()); + } + for (TopExp_Explorer xp(d, TopAbs_VERTEX, TopAbs_EDGE); xp.More(); xp.Next()) { + shapes.push_back(xp.Current()); + } } -void ShapeMapper::insert(bool generated, const TopoDS_Shape &s, const TopoDS_Shape &d) +void ShapeMapper::populate(MappingStatus status, + const TopTools_ListOfShape& src, + const TopTools_ListOfShape& dst) { - if (s.IsNull() || d.IsNull()) return; + for (TopTools_ListIteratorOfListOfShape it(src); it.More(); it.Next()) { + populate(status, it.Value(), dst); + } +} + +void ShapeMapper::populate(MappingStatus status, + const TopoShape& src, + const TopTools_ListOfShape& dst) +{ + if (src.isNull()) { + return; + } + std::vector dstShapes; + for (TopTools_ListIteratorOfListOfShape it(dst); it.More(); it.Next()) { + expand(it.Value(), dstShapes); + } + insert(status, src.getShape(), dstShapes); +} + +void ShapeMapper::insert(MappingStatus status, const TopoDS_Shape& s, const TopoDS_Shape& d) +{ + if (s.IsNull() || d.IsNull()) { + return; + } // Prevent an element shape from being both generated and modified - if (generated) { - if (_modifiedShapes.count(d)) + if (status == MappingStatus::Generated) { + if (_modifiedShapes.count(d)) { return; + } _generatedShapes.insert(d); - } else { - if( _generatedShapes.count(d)) + } + else { + if (_generatedShapes.count(d)) { return; + } _modifiedShapes.insert(d); } - auto &entry = generated?_generated[s]:_modified[s]; - if(entry.shapeSet.insert(d).second) + auto& entry = (status == MappingStatus::Generated) ? _generated[s] : _modified[s]; + if (entry.shapeSet.insert(d).second) { entry.shapes.push_back(d); -}; - -void ShapeMapper::insert(bool generated, const TopoDS_Shape &s, const std::vector &d) -{ - if (s.IsNull() || d.empty()) return; - auto &entry = generated?_generated[s]:_modified[s]; - for(auto &shape : d) { - // Prevent an element shape from being both generated and modified - if (generated) { - if (_modifiedShapes.count(shape)) - continue; - _generatedShapes.insert(shape); - } else { - if( _generatedShapes.count(shape)) - continue; - _modifiedShapes.insert(shape); - } - if(entry.shapeSet.insert(shape).second) - entry.shapes.push_back(shape); } }; -} +void ShapeMapper::insert(MappingStatus status, + const TopoDS_Shape& s, + const std::vector& d) +{ + if (s.IsNull() || d.empty()) { + return; + } + auto& entry = (status == MappingStatus::Generated) ? _generated[s] : _modified[s]; + for (auto& shape : d) { + // Prevent an element shape from being both generated and modified + if (status == MappingStatus::Generated) { + if (_modifiedShapes.count(shape)) { + continue; + } + _generatedShapes.insert(shape); + } + else { + if (_generatedShapes.count(shape)) { + continue; + } + _modifiedShapes.insert(shape); + } + if (entry.shapeSet.insert(shape).second) { + entry.shapes.push_back(shape); + } + } +}; + +} // namespace Part diff --git a/src/Mod/Part/App/TopoShapeMapper.h b/src/Mod/Part/App/TopoShapeMapper.h index 89080ae46e..5b67c4deb2 100644 --- a/src/Mod/Part/App/TopoShapeMapper.h +++ b/src/Mod/Part/App/TopoShapeMapper.h @@ -12,39 +12,45 @@ class BRepTools_History; class BRepTools_ReShape; class ShapeFix_Root; -namespace Part +namespace Part { /// Shape hasher that ignore orientation -struct ShapeHasher { - inline size_t operator()(const TopoShape &s) const { +struct ShapeHasher +{ + inline size_t operator()(const TopoShape& s) const + { #if OCC_VERSION_HEX >= 0x070800 return std::hash {}(s.getShape()); #else return s.getShape().HashCode(INT_MAX); #endif } - inline size_t operator()(const TopoDS_Shape &s) const { + inline size_t operator()(const TopoDS_Shape& s) const + { #if OCC_VERSION_HEX >= 0x070800 return std::hash {}(s); #else return s.HashCode(INT_MAX); #endif } - inline bool operator()(const TopoShape &a, const TopoShape &b) const { + inline bool operator()(const TopoShape& a, const TopoShape& b) const + { return a.getShape().IsSame(b.getShape()); } - inline bool operator()(const TopoDS_Shape &a, const TopoDS_Shape &b) const { + inline bool operator()(const TopoDS_Shape& a, const TopoDS_Shape& b) const + { return a.IsSame(b); } - template + template static inline void hash_combine(std::size_t& seed, const T& v) { // copied from boost::hash_combine std::hash hasher; - seed ^= hasher(v) + 0x9e3779b9 + (seed<<6) + (seed>>2); + seed ^= hasher(v) + 0x9e3779b9 + (seed << 6) + (seed >> 2); } - inline size_t operator()(const std::pair &s) const { + inline size_t operator()(const std::pair& s) const + { #if OCC_VERSION_HEX >= 0x070800 size_t res = std::hash {}(s.first.getShape()); hash_combine(res, std::hash {}(s.second.getShape())); @@ -54,7 +60,8 @@ struct ShapeHasher { #endif return res; } - inline size_t operator()(const std::pair &s) const { + inline size_t operator()(const std::pair& s) const + { #if OCC_VERSION_HEX >= 0x070800 size_t res = std::hash {}(s.first); hash_combine(res, std::hash {}(s.second)); @@ -64,130 +71,150 @@ struct ShapeHasher { #endif return res; } - inline bool operator()(const std::pair &a, - const std::pair &b) const { + inline bool operator()(const std::pair& a, + const std::pair& b) const + { return a.first.getShape().IsSame(b.first.getShape()) && a.second.getShape().IsSame(b.second.getShape()); } - inline bool operator()(const std::pair &a, - const std::pair &b) const { - return a.first.IsSame(b.first) - && a.second.IsSame(b.second); + inline bool operator()(const std::pair& a, + const std::pair& b) const + { + return a.first.IsSame(b.first) && a.second.IsSame(b.second); } }; +enum class MappingStatus +{ + Generated, + Modified +}; /** Shape mapper for user defined shape mapping */ -struct PartExport ShapeMapper: TopoShape::Mapper { +struct PartExport ShapeMapper: TopoShape::Mapper +{ virtual ~ShapeMapper() noexcept = default; /** Populate mapping from a source shape to a list of shape * - * @param generated: whether the shape is generated + * @param status: whether the shape is generated * @param src: source shape * @param dst: a list of sub shapes in the new shape * * The source will be expanded into sub shapes of faces, edges and vertices * before being inserted into the map. */ - void populate(bool generated, const TopoShape &src, const TopTools_ListOfShape &dst); + void populate(MappingStatus status, const TopoShape& src, const TopTools_ListOfShape& dst); /** Populate mapping from a source sub shape to a list of shape * - * @param generated: whether the shape is generated + * @param status: whether the shape is generated * @param src: a list of sub shapes in the source shape * @param dst: a list of sub shapes in the new shape * * The source will be expanded into sub shapes of faces, edges and vertices * before being inserted into the map. */ - void populate(bool generated, const TopTools_ListOfShape &src, const TopTools_ListOfShape &dst); + void populate(MappingStatus status, + const TopTools_ListOfShape& src, + const TopTools_ListOfShape& dst); /** Populate mapping from a source sub shape to a list of shape * - * @param generated: whether the shape is generated + * @param status: whether the shape is generated * @param src: a list of sub shapes in the source shape * @param dst: a list of sub shapes in the new shape * * The source will be expanded into sub shapes of faces, edges and vertices * before being inserted into the map. */ - void populate(bool generated, const std::vector &src, const std::vector &dst) + void populate(MappingStatus status, + const std::vector& src, + const std::vector& dst) { - for(auto &s : src) - populate(generated,s,dst); + for (auto& s : src) { + populate(status, s, dst); + } } /** Populate mapping from a source sub shape to a list of shape * - * @param generated: whether the shape is generated + * @param status: whether the shape is generated * @param src: a sub shape of the source shape * @param dst: a list of sub shapes in the new shape * * The source will be expanded into sub shapes of faces, edges and vertices * before being inserted into the map. */ - void populate(bool generated, const TopoShape &src, const std::vector &dst) + void populate(MappingStatus status, const TopoShape& src, const std::vector& dst) { - if(src.isNull()) + if (src.isNull()) { return; + } std::vector dstShapes; - for(auto &d : dst) + for (auto& d : dst) { expand(d.getShape(), dstShapes); - insert(generated, src.getShape(), dstShapes); + } + insert(status, src.getShape(), dstShapes); } /** Expand a shape into faces, edges and vertices * @params d: shape to expand * @param shapes: output sub shapes of faces, edges and vertices */ - void expand(const TopoDS_Shape &d, std::vector &shapes); + void expand(const TopoDS_Shape& d, std::vector& shapes); /** Insert a map entry from a sub shape in the source to a list of sub shapes in the new shape * - * @params generated: whether the sub shapes are generated or modified + * @params status: whether the sub shapes are generated or modified * @param s: a sub shape in the source * @param d: a list of sub shapes in the new shape */ - void insert(bool generated, const TopoDS_Shape &s, const std::vector &d); + void insert(MappingStatus status, const TopoDS_Shape& s, const std::vector& d); /** Insert a map entry from a sub shape in the source to a sub shape in the new shape * - * @params generated: whether the sub shapes are generated or modified + * @params status: whether the sub shapes are generated or modified * @param s: a sub shape in the source * @param d: a list of sub shapes in the new shape */ - void insert(bool generated, const TopoDS_Shape &s, const TopoDS_Shape &d); + void insert(MappingStatus status, const TopoDS_Shape& s, const TopoDS_Shape& d); - virtual const std::vector &generated(const TopoDS_Shape &s) const override { + const std::vector& generated(const TopoDS_Shape& s) const override + { auto iter = _generated.find(s); - if(iter != _generated.end()) + if (iter != _generated.end()) { return iter->second.shapes; + } return _res; } - virtual const std::vector &modified(const TopoDS_Shape &s) const override { + const std::vector& modified(const TopoDS_Shape& s) const override + { auto iter = _modified.find(s); - if(iter != _modified.end()) + if (iter != _modified.end()) { return iter->second.shapes; + } return _res; } std::vector shapes; - std::unordered_set shapeSet; + std::unordered_set shapeSet; - struct ShapeValue { + struct ShapeValue + { std::vector shapes; - std::unordered_set shapeSet; + std::unordered_set shapeSet; }; - typedef std::unordered_map ShapeMap; + typedef std::unordered_map ShapeMap; ShapeMap _generated; - std::unordered_set _generatedShapes; + std::unordered_set _generatedShapes; ShapeMap _modified; - std::unordered_set _modifiedShapes; + std::unordered_set _modifiedShapes; }; -/// Parameters for TopoShape::makEFilledFace() -struct PartExport TopoShape::BRepFillingParams { +/// Parameters for TopoShape::makeElementFilledFace() +struct PartExport TopoShape::BRepFillingParams +{ /** Optional initial surface to begin the construction of the surface for the filled face. * * It is useful if the surface resulting from construction for the @@ -211,7 +238,8 @@ struct PartExport TopoShape::BRepFillingParams { std::unordered_map supports; /// Optional begin index to the input shapes to be used as the boundary of the filled face. int boundary_begin = -1; - /// Optional end index (last index + 1) to the input shapes to be used as the boundary of the filled face. + /// Optional end index (last index + 1) to the input shapes to be used as the boundary of the + /// filled face. int boundary_end = -1; /// The energe minimizing criterion degree; unsigned int degree = 3; @@ -242,4 +270,4 @@ struct PartExport TopoShape::BRepFillingParams { }; -} +} // namespace Part diff --git a/tests/src/Mod/Part/App/TopoShapeMapper.cpp b/tests/src/Mod/Part/App/TopoShapeMapper.cpp index 6f23f19b8d..88c8fa18f6 100644 --- a/tests/src/Mod/Part/App/TopoShapeMapper.cpp +++ b/tests/src/Mod/Part/App/TopoShapeMapper.cpp @@ -38,7 +38,50 @@ private: std::string _docName; }; -TEST_F(TopoShapeMapperTest, shapeHasherTests) +TEST_F(TopoShapeMapperTest, shapeHasherSingle) +{ + // Arrange + auto edge = BRepBuilderAPI_MakeEdge(gp_Pnt(0.0, 0.0, 0.0), gp_Pnt(1.0, 0.0, 0.0)).Edge(); + Part::TopoShape topoShape {edge}; + auto edge2 = BRepBuilderAPI_MakeEdge(gp_Pnt(1.0, 0.0, 0.0), gp_Pnt(1.0, 1.0, 0.0)).Edge(); + Part::TopoShape topoShape2 {edge2}; + struct Part::ShapeHasher hasher; + + // Act + size_t hash1 = hasher(topoShape); + size_t hash2 = hasher(topoShape2); + size_t hash3 = hasher(edge); + size_t hash4 = hasher(edge2); + + // Assert + EXPECT_EQ(hash1, hash3); + EXPECT_EQ(hash2, hash4); + EXPECT_NE(hash1, hash2); +} + +TEST_F(TopoShapeMapperTest, shapeHasherDual) +{ + // Arrange + auto edge = BRepBuilderAPI_MakeEdge(gp_Pnt(0.0, 0.0, 0.0), gp_Pnt(1.0, 0.0, 0.0)).Edge(); + Part::TopoShape topoShape {edge}; + auto edge2 = BRepBuilderAPI_MakeEdge(gp_Pnt(1.0, 0.0, 0.0), gp_Pnt(1.0, 1.0, 0.0)).Edge(); + Part::TopoShape topoShape2 {edge2}; + struct Part::ShapeHasher hasher; + + // Act + size_t hash5 = hasher(topoShape, topoShape); + size_t hash6 = hasher(topoShape, topoShape2); + size_t hash7 = hasher(edge, edge); + size_t hash8 = hasher(edge, edge2); + + // Assert + EXPECT_TRUE(hash5); + EXPECT_FALSE(hash6); + EXPECT_TRUE(hash7); + EXPECT_FALSE(hash8); +} + +TEST_F(TopoShapeMapperTest, shapeHasherPair) { // Arrange auto edge = BRepBuilderAPI_MakeEdge(gp_Pnt(0.0, 0.0, 0.0), gp_Pnt(1.0, 0.0, 0.0)).Edge(); @@ -52,40 +95,44 @@ TEST_F(TopoShapeMapperTest, shapeHasherTests) struct Part::ShapeHasher hasher; // Act - size_t hash1 = hasher(topoShape); - size_t hash2 = hasher(topoShape2); - size_t hash3 = hasher(edge); - size_t hash4 = hasher(edge2); - size_t hash5 = hasher(topoShape, topoShape); - size_t hash6 = hasher(topoShape, topoShape2); - size_t hash7 = hasher(edge, edge); - size_t hash8 = hasher(edge, edge2); size_t hash9 = hasher(pair1); size_t hash10 = hasher(pair2); size_t hash11 = hasher(pair3); size_t hash12 = hasher(pair4); + + // Assert + EXPECT_EQ(hash9, hash11); + EXPECT_EQ(hash10, hash12); + EXPECT_NE(hash9, hash10); +} + +TEST_F(TopoShapeMapperTest, shapeHasherPairs) +{ + // Arrange + auto edge = BRepBuilderAPI_MakeEdge(gp_Pnt(0.0, 0.0, 0.0), gp_Pnt(1.0, 0.0, 0.0)).Edge(); + Part::TopoShape topoShape {edge}; + auto edge2 = BRepBuilderAPI_MakeEdge(gp_Pnt(1.0, 0.0, 0.0), gp_Pnt(1.0, 1.0, 0.0)).Edge(); + Part::TopoShape topoShape2 {edge2}; + std::pair pair1(topoShape, topoShape2); + std::pair pair2(topoShape, topoShape); + std::pair pair3(edge, edge2); + std::pair pair4(edge, edge); + struct Part::ShapeHasher hasher; + + // Act size_t hash13 = hasher(pair1, pair1); size_t hash14 = hasher(pair1, pair2); size_t hash15 = hasher(pair3, pair3); size_t hash16 = hasher(pair3, pair4); // Assert - EXPECT_EQ(hash1, hash3); - EXPECT_EQ(hash2, hash4); - EXPECT_NE(hash1, hash2); - EXPECT_TRUE(hash5); - EXPECT_FALSE(hash6); - EXPECT_TRUE(hash7); - EXPECT_FALSE(hash8); - EXPECT_EQ(hash9, hash11); - EXPECT_EQ(hash10, hash12); - EXPECT_NE(hash9, hash10); EXPECT_TRUE(hash13); EXPECT_FALSE(hash14); EXPECT_TRUE(hash15); EXPECT_FALSE(hash16); } + TEST_F(TopoShapeMapperTest, shapeMapperTests) { // Arrange @@ -97,8 +144,8 @@ TEST_F(TopoShapeMapperTest, shapeMapperTests) // Act auto e = topoShape1.getSubTopoShapes(TopAbs_EDGE); - mapper.populate(false, box1, {e[0], e[1], e[2], e[3]}); - mapper.populate(true, box1, {e[4], e[5], e[6]}); + mapper.populate(Part::MappingStatus::Modified, box1, {e[0], e[1], e[2], e[3]}); + mapper.populate(Part::MappingStatus::Generated, box1, {e[4], e[5], e[6]}); std::vector vec1 = mapper.modified(box1); std::vector vec2 = mapper.generated(box1);