From: eap <eap@opencascade.com>
Date: Fri, 22 Nov 2013 12:37:31 +0000 (+0000)
Subject: 22361: EDF SMESH: Quadrangle (mapping) algorithm: faces with more than 4 edges
X-Git-Tag: V7_3_0a1~24
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=73df78c0c4187c339ddc0a814f047ffa8bbb3373;p=modules%2Fsmesh.git

22361: EDF SMESH: Quadrangle (mapping) algorithm: faces with more than 4 edges

-  StdMeshers_FaceSide(const SMDS_MeshNode*       theNode,
-                      const gp_Pnt2d             thePnt2d,
-                      const StdMeshers_FaceSide* theSide);
+  StdMeshers_FaceSide(const StdMeshers_FaceSide*  theSide,
+                      const SMDS_MeshNode*        theNode,
+                      const gp_Pnt2d*             thePnt2d1,
+                      const gp_Pnt2d*             thePnt2d2=NULL,
+                      const Handle(Geom2d_Curve)& theC2d=NULL,
+                      const double                theUFirst=0.,
+                      const double                theULast=1.);
---

diff --git a/src/StdMeshers/StdMeshers_FaceSide.hxx b/src/StdMeshers/StdMeshers_FaceSide.hxx
index fce2e8de0..2a4e1786f 100644
--- a/src/StdMeshers/StdMeshers_FaceSide.hxx
+++ b/src/StdMeshers/StdMeshers_FaceSide.hxx
@@ -86,9 +86,13 @@ public:
   /*!
    * \brief Simulate a side from a vertex using data from other FaceSide
    */
-  StdMeshers_FaceSide(const SMDS_MeshNode*       theNode,
-                      const gp_Pnt2d             thePnt2d,
-                      const StdMeshers_FaceSide* theSide);
+  StdMeshers_FaceSide(const StdMeshers_FaceSide*  theSide,
+                      const SMDS_MeshNode*        theNode,
+                      const gp_Pnt2d*             thePnt2d1,
+                      const gp_Pnt2d*             thePnt2d2=NULL,
+                      const Handle(Geom2d_Curve)& theC2d=NULL,
+                      const double                theUFirst=0.,
+                      const double                theULast=1.);
   /*!
    * \brief Return wires of a face as StdMeshers_FaceSide's
    */
@@ -251,7 +255,7 @@ protected:
   std::vector<double>               myFirst, myLast;
   std::vector<double>               myNormPar;
   std::vector<double>               myEdgeLength;
-  std::vector<double>               myIsUniform;
+  std::vector<int>                  myIsUniform;
   double                            myLength;
   int                               myNbPonits, myNbSegments;
   SMESH_ProxyMesh::Ptr              myProxyMesh;