X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH%2FSMESH_MesherHelper.hxx;h=05173ae0656f6eecd150cef7a0a80c9cd8132aea;hp=5b2997a251540c254182c4a322b1fb5a920c14aa;hb=dcf2fe5cadade3e9581d68b44e6b9d5db5040247;hpb=6bac08c1a81f34d3f21c550bd92f83654b2546a5

diff --git a/src/SMESH/SMESH_MesherHelper.hxx b/src/SMESH/SMESH_MesherHelper.hxx
index 5b2997a25..05173ae06 100644
--- a/src/SMESH/SMESH_MesherHelper.hxx
+++ b/src/SMESH/SMESH_MesherHelper.hxx
@@ -236,6 +236,10 @@ class SMESH_EXPORT SMESH_MesherHelper
   static TopAbs_ShapeEnum GetGroupType(const TopoDS_Shape& group,
                                        const bool          avoidCompound=false);
 
+  static TopoDS_Shape GetShapeOfHypothesis( const SMESHDS_Hypothesis * hyp,
+                                            const TopoDS_Shape&        shape,
+                                            SMESH_Mesh*                mesh);
+
 
 public:
   // ---------- PUBLIC INSTANCE METHODS ----------
@@ -243,7 +247,9 @@ public:
   // constructor
   SMESH_MesherHelper(SMESH_Mesh& theMesh);
 
-  SMESH_Mesh* GetMesh() const { return myMesh; }
+  SMESH_Gen*    GetGen() const { return GetMesh()->GetGen(); }
+    
+  SMESH_Mesh*   GetMesh() const { return myMesh; }
     
   SMESHDS_Mesh* GetMeshDS() const { return GetMesh()->GetMeshDS(); }
     
@@ -482,10 +488,10 @@ public:
                            bool *       isBadTria=0);
   /*!
    * \brief Define a pointer to wrapper over a function of gp_XY class,
-   *       suitable to pass as xyFunPtr to applyIn2D().
+   *       suitable to pass as xyFunPtr to ApplyIn2D().
    *       For exaple gp_XY_FunPtr(Added) defines pointer gp_XY_Added to function
    *       calling gp_XY::Added(gp_XY), which is to be used like following
-   *       applyIn2D(surf, uv1, uv2, gp_XY_Added)
+   *       ApplyIn2D(surf, uv1, uv2, gp_XY_Added)
    */
 #define gp_XY_FunPtr(meth) \
   static gp_XY __gpXY_##meth (const gp_XY& uv1, const gp_XY& uv2) { return uv1.meth( uv2 ); } \
@@ -496,18 +502,26 @@ public:
    *        It takes into account period of the surface. Use gp_XY_FunPtr macro
    *        to easily define pointer to function of gp_XY class.
    */
-  static gp_XY applyIn2D(const Handle(Geom_Surface)& surface,
-                         const gp_XY&                uv1,
-                         const gp_XY&                uv2,
-                         xyFunPtr                    fun,
-                         const bool                  resultInPeriod=true);
-                          
+  static gp_XY ApplyIn2D(Handle(Geom_Surface) surface,
+                         const gp_XY&         uv1,
+                         const gp_XY&         uv2,
+                         xyFunPtr             fun,
+                         const bool           resultInPeriod=true);
+
+  /*!
+   * \brief Move node positions on a FACE within surface period
+   *  \param [in] face - the FACE
+   *  \param [inout] uv - node positions to adjust
+   *  \param [in] nbUV - nb of \a uv
+   */
+  void AdjustByPeriod( const TopoDS_Face& face, gp_XY uv[], const int nbUV );
+
   /*!
    * \brief Check if inFaceNode argument is necessary for call GetNodeUV(F,..)
-    * \retval bool - return true if the face is periodic
-    *
-    * If F is Null, answer about subshape set through IsQuadraticSubMesh() or
-    * SetSubShape()
+   *  \retval bool - return true if the face is periodic
+   *
+   * If F is Null, answer about subshape set through IsQuadraticSubMesh() or
+   * SetSubShape()
    */
   bool GetNodeUVneedInFaceNode(const TopoDS_Face& F = TopoDS_Face()) const;