kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

ShapeMapper code from RT branch to new TopoShapeMapper files

Browse Source
This commit is contained in:
Zheng, Lei
2024-01-15 22:41:24 -05:00
committed by bgbsww
parent adb1fcfed8
commit 8811a590b0
4 changed files with 388 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Part/App/CMakeLists.txt
View File

@@ -533,6 +533,8 @@ SET(Part_SRCS
TopoShapeCache.cpp
TopoShapeCache.h
TopoShapeExpansion.cpp
TopoShapeMapper.h
TopoShapeMapper.cpp
TopoShapeOpCode.h
edgecluster.cpp
edgecluster.h

56
src/Mod/Part/App/TopoShape.h
View File

@@ -613,6 +613,27 @@ public:
bool hasPendingElementMap() const;
/** Helper class to return the generated and modified shape given an input shape
*
* Shape history information is extracted using OCCT APIs
* BRepBuilderAPI_MakeShape::Generated/Modified(). However, there is often
* some glitches in various derived class. So we use this class as an
* abstraction, and create various derived classes to deal with the glitches.
*/
struct PartExport Mapper {
/// Helper vector for temporary storage of both generated and modified shapes
mutable std::vector<TopoDS_Shape> _res;
virtual ~Mapper() {}
/// Return a list of shape generated from the given input shape
virtual const std::vector<TopoDS_Shape> &generated(const TopoDS_Shape &) const {
return _res;
}
/// Return a list of shape modified from the given input shape
virtual const std::vector<TopoDS_Shape> &modified(const TopoDS_Shape &) const {
return _res;
}
};
/** Make a compound shape
*
* @param shapes: input shapes
@@ -629,6 +650,41 @@ public:
*/
TopoShape &makeElementCompound(const std::vector<TopoShape> &shapes, const char *op=nullptr, bool force=true);
struct BRepFillingParams;
/** Provides information about the continuity of a curve.
* Corresponds to OCCT type GeomAbs_Shape
*/
enum class Continuity {
/// Only geometric continuity
C0,
/** for each point on the curve, the tangent vectors 'on the right' and 'on
* the left' are collinear with the same orientation.
*/
G1,
/** Continuity of the first derivative. The 'C1' curve is also 'G1' but, in
* addition, the tangent vectors 'on the right' and 'on the left' are equal.
*/
C1,
/** For each point on the curve, the normalized normal vectors 'on the
* right' and 'on the left' are equal.
*/
G2,
/// Continuity of the second derivative.
C2,
/// Continuity of the third derivative.
C3,
/** Continuity of the N-th derivative, whatever is the value given for N
* (infinite order of continuity). Also provides information about the
* continuity of a surface.
*/
CN,
};
friend class TopoShapeCache;
private:

75
src/Mod/Part/App/TopoShapeMapper.cpp Normal file
View File

@@ -0,0 +1,75 @@
#include "TopoShapeMapper.h"
namespace Part
{
void ShapeMapper::expand(const TopoDS_Shape &d, std::vector<TopoDS_Shape> &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())
return;
std::vector<TopoDS_Shape> dstShapes;
for(TopTools_ListIteratorOfListOfShape it(dst);it.More();it.Next())
expand(it.Value(), dstShapes);
insert(generated, src.getShape(), dstShapes);
}
void ShapeMapper::insert(bool generated, 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))
return;
_generatedShapes.insert(d);
} else {
if( _generatedShapes.count(d))
return;
_modifiedShapes.insert(d);
}
auto &entry = 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<TopoDS_Shape> &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);
}
};
}

255
src/Mod/Part/App/TopoShapeMapper.h Normal file
View File

@@ -0,0 +1,255 @@
#include <map>
#include <unordered_set>
#include <vector>
#include <TopoDS_Shape.hxx>
#include <TopExp_Explorer.hxx>
#include "TopoShape.h"
class BRepBuilderAPI_MakeShape;
class BRepTools_History;
class BRepTools_ReShape;
class ShapeFix_Root;
namespace Part
{
/// Shape hasher that ignore orientation
struct ShapeHasher {
inline size_t operator()(const TopoShape &s) const {
return std::hash<TopoDS_Shape> {}(s.getShape());
// return TopTools_ShapeMapHasher{}(s.getShape());
}
inline size_t operator()(const TopoDS_Shape &s) const {
return std::hash<TopoDS_Shape> {}(s);
}
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 {
return a.IsSame(b);
}
template <class T>
static inline void hash_combine(std::size_t& seed, const T& v)
{
// copied from boost::hash_combine
std::hash<T> hasher;
seed ^= hasher(v) + 0x9e3779b9 + (seed<<6) + (seed>>2);
}
inline size_t operator()(const std::pair<TopoShape, TopoShape> &s) const {
size_t res = std::hash<TopoDS_Shape> {}(s.first.getShape());
hash_combine(res, std::hash<TopoDS_Shape> {}(s.second.getShape()));
return res;
}
inline size_t operator()(const std::pair<TopoDS_Shape, TopoDS_Shape> &s) const {
size_t res = std::hash<TopoDS_Shape> {}(s.first);
hash_combine(res, std::hash<TopoDS_Shape> {}(s.second));
return res;
}
inline bool operator()(const std::pair<TopoShape, TopoShape> &a,
const std::pair<TopoShape, TopoShape> &b) const {
return a.first.getShape().IsSame(b.first.getShape())
&& a.second.getShape().IsSame(b.second.getShape());
}
inline bool operator()(const std::pair<TopoDS_Shape, TopoDS_Shape> &a,
const std::pair<TopoDS_Shape, TopoDS_Shape> &b) const {
return a.first.IsSame(b.first)
&& a.second.IsSame(b.second);
}
};
/** Shape mapper for generic BRepBuilderAPI_MakeShape derived class
*
* Uses BRepBuilderAPI_MakeShape::Modified/Generated() function to extract
* shape history for generating mapped element names
*/
struct PartExport MapperMaker: TopoShape::Mapper {
BRepBuilderAPI_MakeShape &maker;
MapperMaker(BRepBuilderAPI_MakeShape &maker)
:maker(maker)
{}
virtual const std::vector<TopoDS_Shape> &modified(const TopoDS_Shape &s) const override;
virtual const std::vector<TopoDS_Shape> &generated(const TopoDS_Shape &s) const override;
};
/** Shape mapper for BRepTools_History
*
* Uses BRepTools_History::Modified/Generated() function to extract
* shape history for generating mapped element names
*/
struct PartExport MapperHistory: TopoShape::Mapper {
Handle(BRepTools_History) history;
MapperHistory(const Handle(BRepTools_History) &history);
MapperHistory(const Handle(BRepTools_ReShape) &reshape);
MapperHistory(ShapeFix_Root &fix);
virtual const std::vector<TopoDS_Shape> &modified(const TopoDS_Shape &s) const override;
virtual const std::vector<TopoDS_Shape> &generated(const TopoDS_Shape &s) const override;
};
/** Shape mapper for user defined shape mapping
*/
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 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);
/** Populate mapping from a source sub shape to a list of shape
*
* @param generated: 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);
/** Populate mapping from a source sub shape to a list of shape
*
* @param generated: 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<TopoShape> &src, const std::vector<TopoShape> &dst)
{
for(auto &s : src)
populate(generated,s,dst);
}
/** Populate mapping from a source sub shape to a list of shape
*
* @param generated: 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<TopoShape> &dst)
{
if(src.isNull())
return;
std::vector<TopoDS_Shape> dstShapes;
for(auto &d : dst)
expand(d.getShape(), dstShapes);
insert(generated, 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<TopoDS_Shape> &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
* @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<TopoDS_Shape> &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
* @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);
virtual const std::vector<TopoDS_Shape> &generated(const TopoDS_Shape &s) const override {
auto iter = _generated.find(s);
if(iter != _generated.end())
return iter->second.shapes;
return _res;
}
virtual const std::vector<TopoDS_Shape> &modified(const TopoDS_Shape &s) const override {
auto iter = _modified.find(s);
if(iter != _modified.end())
return iter->second.shapes;
return _res;
}
std::vector<TopoShape> shapes;
std::unordered_set<TopoDS_Shape,ShapeHasher,ShapeHasher> shapeSet;
struct ShapeValue {
std::vector<TopoDS_Shape> shapes;
std::unordered_set<TopoDS_Shape,ShapeHasher,ShapeHasher> shapeSet;
};
typedef std::unordered_map<TopoDS_Shape, ShapeValue,ShapeHasher,ShapeHasher> ShapeMap;
ShapeMap _generated;
std::unordered_set<TopoDS_Shape,ShapeHasher,ShapeHasher> _generatedShapes;
ShapeMap _modified;
std::unordered_set<TopoDS_Shape,ShapeHasher,ShapeHasher> _modifiedShapes;
};
/// Parameters for TopoShape::makEFilledFace()
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
* algorithm is likely to be complex. The support surface of the face
* under construction is computed by a deformation of Surf which satisfies
* the given constraints. The set of bounding edges defines the wire of
* the face. If no initial surface is given, the algorithm computes it
* automatically. If the set of edges is not connected (Free constraint),
* missing edges are automatically computed. Important: the initial
* surface must have orthogonal local coordinates, i.e. partial
* derivatives dS/du and dS/dv must be orthogonal at each point of
* surface. If this condition breaks, distortions of resulting surface are
* possible
*/
TopoShape surface;
/** Optional map from input edge to continutity order. The default
* continuity order is TopoShape::Continuity::C0.
*/
std::unordered_map<TopoDS_Shape, TopoShape::Continuity, ShapeHasher, ShapeHasher> orders;
/// Optional map from input shape to face used as support
std::unordered_map<TopoDS_Shape, TopoDS_Shape, ShapeHasher, ShapeHasher> 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.
int boundary_end = -1;
/// The energe minimizing criterion degree;
unsigned int degree = 3;
/// The number of points on the curve NbPntsOnCur
unsigned int ptsoncurve = 15;
/// The number of iterations NbIter
unsigned int numiter = 2;
/// The Boolean Anisotropie
bool anisotropy = false;
/// The 2D tolerance Tol2d
double tol2d = 1e-5;
/// The 3D tolerance Tol3d
double tol3d = 1e-4;
/// The angular tolerance TolAng
double tolG1 = 0.01;
/// The tolerance for curvature TolCur
double tolG2 = 0.1;
/// The highest polynomial degree MaxDeg
unsigned int maxdeg = 8;
/** The greatest number of segments MaxSeg.
*
* If the Boolean Anistropie is true, the algorithm's performance is better
* in cases where the ratio of the length U and the length V indicate a
* great difference between the two. In other words, when the surface is,
* for example, extremely long.
*/
unsigned int maxseg = 9;
};
}