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
Merge rnv/win_swig_generation branch.
[modules/smesh.git]
/
src
/
SMESH
/
SMESH_MesherHelper.hxx
diff --git
a/src/SMESH/SMESH_MesherHelper.hxx
b/src/SMESH/SMESH_MesherHelper.hxx
index 8c598fb62ffeecdb5b0bd14619d60fa9f422ad15..cf3506fea7af1d83ed6c12f37debde26c5b88622 100644
(file)
--- a/
src/SMESH/SMESH_MesherHelper.hxx
+++ b/
src/SMESH/SMESH_MesherHelper.hxx
@@
-122,7
+122,9
@@
class SMESH_EXPORT SMESH_MesherHelper
/*!
* \brief Return true if 2D mesh on FACE is distored
*/
/*!
* \brief Return true if 2D mesh on FACE is distored
*/
- static bool IsDistorted2D( SMESH_subMesh* faceSM, bool checkUV=false );
+ static bool IsDistorted2D( SMESH_subMesh* faceSM,
+ bool checkUV = false,
+ SMESH_MesherHelper* faceHelper = NULL);
/*!
* \brief Returns true if given node is medium
/*!
* \brief Returns true if given node is medium
@@
-187,7
+189,7
@@
class SMESH_EXPORT SMESH_MesherHelper
* \brief Count nb of sub-shapes
* \param shape - the shape
* \param type - the type of sub-shapes to count
* \brief Count nb of sub-shapes
* \param shape - the shape
* \param type - the type of sub-shapes to count
- * \param ignoreSame - if true, use map not to count same shapes, e
sl
e use explorer
+ * \param ignoreSame - if true, use map not to count same shapes, e
ls
e use explorer
* \retval int - the calculated number
*/
static int Count(const TopoDS_Shape& shape,
* \retval int - the calculated number
*/
static int Count(const TopoDS_Shape& shape,
@@
-201,11
+203,12
@@
class SMESH_EXPORT SMESH_MesherHelper
const SMESH_Mesh& mesh,
TopAbs_ShapeEnum ancestorType=TopAbs_SHAPE);
/*!
const SMESH_Mesh& mesh,
TopAbs_ShapeEnum ancestorType=TopAbs_SHAPE);
/*!
- * \brief Return iterator on ancestors of the given type
+ * \brief Return iterator on ancestors of the given type
, included into a container shape
*/
static PShapeIteratorPtr GetAncestors(const TopoDS_Shape& shape,
const SMESH_Mesh& mesh,
*/
static PShapeIteratorPtr GetAncestors(const TopoDS_Shape& shape,
const SMESH_Mesh& mesh,
- TopAbs_ShapeEnum ancestorType);
+ TopAbs_ShapeEnum ancestorType,
+ const TopoDS_Shape* container = 0);
/*!
* \brief Find a common ancestor, of the given type, of two shapes
*/
/*!
* \brief Find a common ancestor, of the given type, of two shapes
*/
@@
-317,6
+320,12
@@
public:
* \brief Return the shape set by IsQuadraticSubMesh() or SetSubShape()
*/
const TopoDS_Shape& GetSubShape() const { return myShape; }
* \brief Return the shape set by IsQuadraticSubMesh() or SetSubShape()
*/
const TopoDS_Shape& GetSubShape() const { return myShape; }
+ /*!
+ * \brief Copy shape information from another helper to improve performance
+ * since SetSubShape() can be time consuming if there are many edges
+ */
+ void CopySubShapeInfo(const SMESH_MesherHelper& other);
+
/*!
* \brief Convert a shape to its index in the SMESHDS_Mesh
/*!
* \brief Convert a shape to its index in the SMESHDS_Mesh
@@
-610,6
+619,10
@@
public:
* \brief Return an alternative parameter for a node on seam
*/
double GetOtherParam(const double param) const;
* \brief Return an alternative parameter for a node on seam
*/
double GetOtherParam(const double param) const;
+ /*!
+ * \brief Check if UV is on seam. Return 0 if not, 1 for U seam, 2 for V seam
+ */
+ int IsOnSeam(const gp_XY& uv) const;
/*!
* \brief Return existing or create new medium nodes between given ones
/*!
* \brief Return existing or create new medium nodes between given ones
@@
-692,6
+705,7
@@
public:
static void WriteShape(const TopoDS_Shape& s);
static void WriteShape(const TopoDS_Shape& s);
+
protected:
/*!
protected:
/*!
@@
-708,9
+722,10
@@
public:
double getFaceMaxTol( const TopoDS_Shape& face ) const;
double getFaceMaxTol( const TopoDS_Shape& face ) const;
+
private:
private:
- //
Forbi
den copy constructor
+ //
forbid
den copy constructor
SMESH_MesherHelper (const SMESH_MesherHelper& theOther);
// key of a map of bi-quadratic face to it's central node
SMESH_MesherHelper (const SMESH_MesherHelper& theOther);
// key of a map of bi-quadratic face to it's central node