Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[bos #40653][CEA] New mesh import export formats with meshio.
[modules/smesh.git]
/
src
/
SMESHUtils
/
SMESH_MAT2d.hxx
diff --git
a/src/SMESHUtils/SMESH_MAT2d.hxx
b/src/SMESHUtils/SMESH_MAT2d.hxx
index 2ba0066c5efa9566c3a5bc82427de6be63c32df5..316216bbf2d03f965ab3a6a614c003fa691fb5a6 100644
(file)
--- a/
src/SMESHUtils/SMESH_MAT2d.hxx
+++ b/
src/SMESHUtils/SMESH_MAT2d.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
15 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
24 CEA, EDF
, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-56,7
+56,7
@@
namespace SMESH_MAT2d
//-------------------------------------------------------------------------------------
// type of Branch end point
enum BranchEndType { BE_UNDEF,
//-------------------------------------------------------------------------------------
// type of Branch end point
enum BranchEndType { BE_UNDEF,
- BE_ON_VERTEX, // branch ends at a convex VRTEX
+ BE_ON_VERTEX, // branch ends at a convex V
E
RTEX
BE_BRANCH_POINT, // branch meats 2 or more other branches
BE_END // branch end equidistant from several adjacent segments
};
BE_BRANCH_POINT, // branch meats 2 or more other branches
BE_END // branch end equidistant from several adjacent segments
};
@@
-82,7
+82,8
@@
namespace SMESH_MAT2d
std::size_t _iEdge; // MA edge index within the branch
double _edgeParam; // normalized param within the MA edge
std::size_t _iEdge; // MA edge index within the branch
double _edgeParam; // normalized param within the MA edge
- BranchPoint(): _branch(0), _iEdge(0), _edgeParam(-1) {}
+ BranchPoint( const Branch* b = 0, std::size_t e = 0, double u = -1 ):
+ _branch(b), _iEdge(e), _edgeParam(u) {}
};
//-------------------------------------------------------------------------------------
/*!
};
//-------------------------------------------------------------------------------------
/*!
@@
-119,9
+120,9
@@
namespace SMESH_MAT2d
public: // internal: construction
public: // internal: construction
- void init( std::vector<const TVDEdge*>& maEdges,
- const Boundary* boundary,
- std::map< const TVDVertex*, BranchEndType > endType);
+ void init( std::vector<const TVDEdge*>&
maEdges,
+ const Boundary*
boundary,
+ std::map< const TVDVertex*, BranchEndType >
&
endType);
void setBranchesToEnds( const std::vector< Branch >& branches);
BranchPoint getPoint( const TVDVertex* vertex ) const;
void setRemoved( const BranchPoint& proxyPoint );
void setBranchesToEnds( const std::vector< Branch >& branches);
BranchPoint getPoint( const TVDVertex* vertex ) const;
void setRemoved( const BranchPoint& proxyPoint );
@@
-138,7
+139,7
@@
namespace SMESH_MAT2d
std::vector< BranchPoint >& divPoints,
const std::vector<const TVDEdge*>& maEdges,
const std::vector<const TVDEdge*>& maEdgesTwin,
std::vector< BranchPoint >& divPoints,
const std::vector<const TVDEdge*>& maEdges,
const std::vector<const TVDEdge*>& maEdgesTwin,
-
size_t &
i) const;
+
int &
i) const;
// association of _maEdges with boundary segments is stored in this way:
// index of an EDGE: TVDEdge->cell()->color()
// association of _maEdges with boundary segments is stored in this way:
// index of an EDGE: TVDEdge->cell()->color()
@@
-180,6
+181,8
@@
namespace SMESH_MAT2d
bool getBranchPoint( const std::size_t iEdge, double u, BranchPoint& p ) const;
bool getBranchPoint( const std::size_t iEdge, double u, BranchPoint& p ) const;
+ bool getBranchPoint( const BoundaryPoint& bp, BranchPoint& p ) const;
+
bool isConcaveSegment( std::size_t iEdge, std::size_t iSeg ) const;
bool moveToClosestEdgeEnd( BoundaryPoint& bp ) const;
bool isConcaveSegment( std::size_t iEdge, std::size_t iSeg ) const;
bool moveToClosestEdgeEnd( BoundaryPoint& bp ) const;