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
INT PAL 0052683: Parameter "Color group" in the "Create Group" dialog box is empty
[modules/smesh.git]
/
src
/
SMESH
/
SMESH_MesherHelper.hxx
diff --git
a/src/SMESH/SMESH_MesherHelper.hxx
b/src/SMESH/SMESH_MesherHelper.hxx
index f2b4d9ffc5d241c4499ae8f0136a2a9c52dbbd88..5b2997a251540c254182c4a322b1fb5a920c14aa 100644
(file)
--- a/
src/SMESH/SMESH_MesherHelper.hxx
+++ b/
src/SMESH/SMESH_MesherHelper.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, 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
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-97,7
+97,7
@@
class SMESH_EXPORT SMESH_MesherHelper
* The key of the map is a normalized parameter of each
* base node on theBaseSide. Edges in theBaseSide must be sequenced.
* This method works in supposition that nodes on the face
* The key of the map is a normalized parameter of each
* base node on theBaseSide. Edges in theBaseSide must be sequenced.
* This method works in supposition that nodes on the face
- * forms a
rectangular
grid and elements can be quardrangles or triangles
+ * forms a
structured
grid and elements can be quardrangles or triangles
*/
static bool LoadNodeColumns(TParam2ColumnMap & theParam2ColumnMap,
const TopoDS_Face& theFace,
*/
static bool LoadNodeColumns(TParam2ColumnMap & theParam2ColumnMap,
const TopoDS_Face& theFace,
@@
-117,6
+117,11
@@
class SMESH_EXPORT SMESH_MesherHelper
*/
static bool IsStructured( SMESH_subMesh* faceSM );
*/
static bool IsStructured( SMESH_subMesh* faceSM );
+ /*!
+ * \brief Return true if 2D mesh on FACE is distored
+ */
+ static bool IsDistorted2D( SMESH_subMesh* faceSM, bool checkUV=false );
+
/*!
* \brief Returns true if given node is medium
* \param n - node to check
/*!
* \brief Returns true if given node is medium
* \param n - node to check
@@
-130,6
+135,7
@@
class SMESH_EXPORT SMESH_MesherHelper
* \param node - the node
* \param meshDS - mesh DS
* \retval TopoDS_Shape - found support shape
* \param node - the node
* \param meshDS - mesh DS
* \retval TopoDS_Shape - found support shape
+ * \sa SMESH_Algo::VertexNode( const TopoDS_Vertex&, SMESHDS_Mesh* )
*/
static TopoDS_Shape GetSubShapeByNode(const SMDS_MeshNode* node,
const SMESHDS_Mesh* meshDS);
*/
static TopoDS_Shape GetSubShapeByNode(const SMDS_MeshNode* node,
const SMESHDS_Mesh* meshDS);
@@
-140,10
+146,8
@@
class SMESH_EXPORT SMESH_MesherHelper
* \param nbNodes - total nb of nodes
* \retval int - valid node index
*/
* \param nbNodes - total nb of nodes
* \retval int - valid node index
*/
- static int WrapIndex(const int ind, const int nbNodes) {
- if ( ind < 0 ) return nbNodes + ind % nbNodes;
- if ( ind >= nbNodes ) return ind % nbNodes;
- return ind;
+ static inline int WrapIndex(int ind, const int nbNodes) {
+ return (( ind %= nbNodes ) < 0 ) ? ind + nbNodes : ind;
}
/*!
}
/*!
@@
-168,15
+172,15
@@
class SMESH_EXPORT SMESH_MesherHelper
* a0 p0 a1
*/
inline static gp_XY calcTFI(double x, double y,
* a0 p0 a1
*/
inline static gp_XY calcTFI(double x, double y,
- const gp_XY
a0,const gp_XY a1,const gp_XY a2,const gp_XY
a3,
- const gp_XY
p0,const gp_XY p1,const gp_XY p2,const gp_XY
p3);
+ const gp_XY
& a0,const gp_XY& a1,const gp_XY& a2,const gp_XY&
a3,
+ const gp_XY
& p0,const gp_XY& p1,const gp_XY& p2,const gp_XY&
p3);
/*!
* \brief Same as "gp_XY calcTFI(...)" but in 3D
*/
inline static gp_XYZ calcTFI(double x, double y,
/*!
* \brief Same as "gp_XY calcTFI(...)" but in 3D
*/
inline static gp_XYZ calcTFI(double x, double y,
- const gp_XYZ
a0,const gp_XYZ a1,const gp_XYZ a2,const gp_XYZ
a3,
- const gp_XYZ
p0,const gp_XYZ p1,const gp_XYZ p2,const gp_XYZ
p3);
+ const gp_XYZ
& a0,const gp_XYZ& a1,const gp_XYZ& a2,const gp_XYZ&
a3,
+ const gp_XYZ
& p0,const gp_XYZ& p1,const gp_XYZ& p2,const gp_XYZ&
p3);
/*!
* \brief Count nb of sub-shapes
* \param shape - the shape
/*!
* \brief Count nb of sub-shapes
* \param shape - the shape
@@
-217,8
+221,14
@@
class SMESH_EXPORT SMESH_MesherHelper
static bool IsSubShape( const TopoDS_Shape& shape, SMESH_Mesh* aMesh );
static bool IsSubShape( const TopoDS_Shape& shape, SMESH_Mesh* aMesh );
+ static bool IsBlock( const TopoDS_Shape& shape );
+
static double MaxTolerance( const TopoDS_Shape& shape );
static double MaxTolerance( const TopoDS_Shape& shape );
+ static double GetAngle( const TopoDS_Edge & E1, const TopoDS_Edge & E2,
+ const TopoDS_Face & F, const TopoDS_Vertex & V,
+ gp_Vec* faceNormal=0);
+
static bool IsClosedEdge( const TopoDS_Edge& anEdge );
static TopoDS_Vertex IthVertex( const bool is2nd, TopoDS_Edge anEdge, const bool CumOri=true );
static bool IsClosedEdge( const TopoDS_Edge& anEdge );
static TopoDS_Vertex IthVertex( const bool is2nd, TopoDS_Edge anEdge, const bool CumOri=true );
@@
-558,13
+568,20
@@
public:
{ return IsRealSeam( GetMeshDS()->ShapeToIndex( subShape)); }
/*!
* \brief Check if the shape set through IsQuadraticSubMesh() or SetSubShape()
{ return IsRealSeam( GetMeshDS()->ShapeToIndex( subShape)); }
/*!
* \brief Check if the shape set through IsQuadraticSubMesh() or SetSubShape()
- * has a seam edge
- * \retval bool - true if it has
+ * has a seam edge, i.e. an edge that has two parametric representations
+ * on a surface
+ * \retval bool - true if it has
*/
bool HasSeam() const { return !mySeamShapeIds.empty(); }
*/
bool HasSeam() const { return !mySeamShapeIds.empty(); }
+ /*!
+ * \brief Check if the shape set through IsQuadraticSubMesh() or SetSubShape()
+ * has a seam edge that encounters twice in a wire
+ * \retval bool - true if it has
+ */
+ bool HasRealSeam() const { return HasSeam() && ( *mySeamShapeIds.begin() < 0 ); }
/*!
* \brief Return index of periodic parametric direction of a closed face
/*!
* \brief Return index of periodic parametric direction of a closed face
-
*
\retval int - 1 for U, 2 for V direction
+
*
\retval int - 1 for U, 2 for V direction
*/
int GetPeriodicIndex() const { return myParIndex; }
/*!
*/
int GetPeriodicIndex() const { return myParIndex; }
/*!
@@
-577,10
+594,14
@@
public:
* \param force3d - true means node creation at the middle between the
* two given nodes, else node position is found on its
* supporting geometrical shape, if any.
* \param force3d - true means node creation at the middle between the
* two given nodes, else node position is found on its
* supporting geometrical shape, if any.
+ * \param expectedSupport - shape type corresponding to element being created
+ * , e.g TopAbs_EDGE if SMDSAbs_Edge is created
+ * basing on \a n1 and \a n2
*/
const SMDS_MeshNode* GetMediumNode(const SMDS_MeshNode* n1,
const SMDS_MeshNode* n2,
*/
const SMDS_MeshNode* GetMediumNode(const SMDS_MeshNode* n1,
const SMDS_MeshNode* n2,
- const bool force3d);
+ const bool force3d,
+ TopAbs_ShapeEnum expectedSupport=TopAbs_SHAPE);
/*!
* \brief Return existing or create a new central node for a quardilateral
* quadratic face given its 8 nodes.
/*!
* \brief Return existing or create a new central node for a quardilateral
* quadratic face given its 8 nodes.
@@
-614,7
+635,8
@@
public:
*/
std::pair<int, TopAbs_ShapeEnum> GetMediumPos(const SMDS_MeshNode* n1,
const SMDS_MeshNode* n2,
*/
std::pair<int, TopAbs_ShapeEnum> GetMediumPos(const SMDS_MeshNode* n1,
const SMDS_MeshNode* n2,
- const bool useCurSubShape=false);
+ const bool useCurSubShape=false,
+ TopAbs_ShapeEnum expectedSupport=TopAbs_SHAPE);
/*!
* \brief Add a link in my data structure
*/
/*!
* \brief Add a link in my data structure
*/
@@
-627,9
+649,9
@@
public:
void AddTLinkNodeMap(const TLinkNodeMap& aMap)
{ myTLinkNodeMap.insert(aMap.begin(), aMap.end()); }
void AddTLinkNodeMap(const TLinkNodeMap& aMap)
{ myTLinkNodeMap.insert(aMap.begin(), aMap.end()); }
-
void
AddTLinks(const SMDS_MeshEdge* edge);
-
void
AddTLinks(const SMDS_MeshFace* face);
-
void
AddTLinks(const SMDS_MeshVolume* vol);
+
bool
AddTLinks(const SMDS_MeshEdge* edge);
+
bool
AddTLinks(const SMDS_MeshFace* face);
+
bool
AddTLinks(const SMDS_MeshVolume* vol);
/**
* Returns myTLinkNodeMap
/**
* Returns myTLinkNodeMap
@@
-654,11
+676,14
@@
public:
* \param uv2 - UV within a face
* \retval gp_Pnt2d - selected UV
*/
* \param uv2 - UV within a face
* \retval gp_Pnt2d - selected UV
*/
- gp_Pnt2d
G
etUVOnSeam( const gp_Pnt2d& uv1, const gp_Pnt2d& uv2 ) const;
+ gp_Pnt2d
g
etUVOnSeam( const gp_Pnt2d& uv1, const gp_Pnt2d& uv2 ) const;
const SMDS_MeshNode* getMediumNodeOnComposedWire(const SMDS_MeshNode* n1,
const SMDS_MeshNode* n2,
bool force3d);
const SMDS_MeshNode* getMediumNodeOnComposedWire(const SMDS_MeshNode* n1,
const SMDS_MeshNode* n2,
bool force3d);
+
+ double getFaceMaxTol( const TopoDS_Shape& face ) const;
+
private:
// Forbiden copy constructor
private:
// Forbiden copy constructor
@@
-693,9
+718,11
@@
public:
double myPar1[2], myPar2[2]; // U and V bounds of a closed periodic surface
int myParIndex; // bounds' index (1-U, 2-V, 3-both)
double myPar1[2], myPar2[2]; // U and V bounds of a closed periodic surface
int myParIndex; // bounds' index (1-U, 2-V, 3-both)
- typedef std::map< int, GeomAPI_ProjectPointOnSurf* > TID2ProjectorOnSurf;
- TID2ProjectorOnSurf myFace2Projector;
+ std::map< int, double > myFaceMaxTol;
+
+ typedef std::map< int, GeomAPI_ProjectPointOnSurf* > TID2ProjectorOnSurf;
typedef std::map< int, GeomAPI_ProjectPointOnCurve* > TID2ProjectorOnCurve;
typedef std::map< int, GeomAPI_ProjectPointOnCurve* > TID2ProjectorOnCurve;
+ TID2ProjectorOnSurf myFace2Projector;
TID2ProjectorOnCurve myEdge2Projector;
TopoDS_Shape myShape;
TID2ProjectorOnCurve myEdge2Projector;
TopoDS_Shape myShape;
@@
-715,8
+742,8
@@
public:
//=======================================================================
inline gp_XY
SMESH_MesherHelper::calcTFI(double x, double y,
//=======================================================================
inline gp_XY
SMESH_MesherHelper::calcTFI(double x, double y,
- const gp_XY
a0,const gp_XY a1,const gp_XY a2,const gp_XY
a3,
- const gp_XY
p0,const gp_XY p1,const gp_XY p2,const gp_XY
p3)
+ const gp_XY
& a0,const gp_XY& a1,const gp_XY& a2,const gp_XY&
a3,
+ const gp_XY
& p0,const gp_XY& p1,const gp_XY& p2,const gp_XY&
p3)
{
return
((1 - y) * p0 + x * p1 + y * p2 + (1 - x) * p3 ) -
{
return
((1 - y) * p0 + x * p1 + y * p2 + (1 - x) * p3 ) -
@@
-725,8
+752,8
@@
SMESH_MesherHelper::calcTFI(double x, double y,
//=======================================================================
inline gp_XYZ
SMESH_MesherHelper::calcTFI(double x, double y,
//=======================================================================
inline gp_XYZ
SMESH_MesherHelper::calcTFI(double x, double y,
- const gp_XYZ
a0,const gp_XYZ a1,const gp_XYZ a2,const gp_XYZ
a3,
- const gp_XYZ
p0,const gp_XYZ p1,const gp_XYZ p2,const gp_XYZ
p3)
+ const gp_XYZ
& a0,const gp_XYZ& a1,const gp_XYZ& a2,const gp_XYZ&
a3,
+ const gp_XYZ
& p0,const gp_XYZ& p1,const gp_XYZ& p2,const gp_XYZ&
p3)
{
return
((1 - y) * p0 + x * p1 + y * p2 + (1 - x) * p3 ) -
{
return
((1 - y) * p0 + x * p1 + y * p2 + (1 - x) * p3 ) -