mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-04 13:13:25 +03:00
0025039: Improvement of code structure of general and supporting tools implemented in BRepMesh
Removed CDL declarations; Data collections are replaced by NCollections; Small code refactoring. Remove definition of BRepMesh class. Code refactoring of BRepMesh_IncrementalMesh. Function BRepMesh_Write storing BRepMesh_DataStructureOfDelaun to BRep file is added for debug needs. Static method BRepMesh_GeomTool::IntLinLin has been added to eliminate code duplications in BRepMesh_Dealun and BRepMesh_CircleTool. BRepMesh_CircleTool simplified method to find circumcircle. Fix merging conflicts Remove redundant function Fix compilation warning on MacOS Revert changes occurred during rebase Resolved merging conflicts Use parallel flag with BRepMesh_FastDiscret Test cases for issue CR25039_2
This commit is contained in:
@@ -49,9 +49,9 @@ public:
|
||||
//! \param theStatus shared flag to set status of the check.
|
||||
//! \param theMutex shared mutex for parallel processing.
|
||||
BRepMesh_WireInterferenceChecker(
|
||||
const std::vector<BRepMesh_WireChecker::SegmentsTree>& theWires,
|
||||
BRepMesh_Status* theStatus,
|
||||
Standard_Mutex* theMutex);
|
||||
const std::vector<BRepMeshCol::SegmentsTree>& theWires,
|
||||
BRepMesh_Status* theStatus,
|
||||
Standard_Mutex* theMutex);
|
||||
|
||||
//! Checker's body.
|
||||
//! \param theWireRange range of wires to be checked.
|
||||
@@ -69,27 +69,6 @@ public:
|
||||
//! \param theWireId Id of discretized wire to be checked.
|
||||
void operator ()(const Standard_Integer& theWireId) const;
|
||||
|
||||
//! Checks intersection between the two segments.
|
||||
//! \param theStartPnt1 start point of first segment.
|
||||
//! \param theEndPnt1 end point of first segment.
|
||||
//! \param theStartPnt2 start point of second segment.
|
||||
//! \param theEndPnt2 end point of second segment.
|
||||
//! \param isConsiderEndPointTouch if TRUE EndPointTouch status will be
|
||||
//! returned in case if segments are touching by end points, if FALSE
|
||||
//! returns NoIntersection flag.
|
||||
//! \param isConsiderPointOnSegment if TRUE PointOnSegment status will be
|
||||
//! returned in case if end point of one segment lies onto another one,
|
||||
//! if FALSE returns NoIntersection flag.
|
||||
//! \param[out] theIntPnt point of intersection.
|
||||
//! \return status of intersection check.
|
||||
static IntFlag Intersect(const gp_XY& theStartPnt1,
|
||||
const gp_XY& theEndPnt1,
|
||||
const gp_XY& theStartPnt2,
|
||||
const gp_XY& theEndPnt2,
|
||||
const Standard_Boolean isConsiderEndPointTouch,
|
||||
const Standard_Boolean isConsiderPointOnSegment,
|
||||
gp_Pnt2d& theIntPnt);
|
||||
|
||||
private:
|
||||
|
||||
//! Classifies the point in case of coincidence of two vectors.
|
||||
@@ -102,12 +81,12 @@ private:
|
||||
const gp_XY& thePoint2,
|
||||
const gp_XY& thePointToCheck);
|
||||
private:
|
||||
const BRepMesh_WireChecker::SegmentsTree* myWires;
|
||||
Standard_Integer myWiresNb;
|
||||
BRepMesh_Status* myStatus;
|
||||
const BRepMeshCol::SegmentsTree* myWires;
|
||||
Standard_Integer myWiresNb;
|
||||
BRepMesh_Status* myStatus;
|
||||
|
||||
#ifdef HAVE_TBB
|
||||
Standard_Mutex* myMutex;
|
||||
Standard_Mutex* myMutex;
|
||||
#endif
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user