X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_Quadrangle_2D.hxx;h=b54edea3f34a53a50928a7278677ccbd59f51409;hp=afa3882f2cc1b7e0ee123daa3b9086b533742ed6;hb=f0cefe4519fb278809c587699f7777ed77a7d142;hpb=c3bf92bd87b770fd81631a3853f7f5bb1ac6a4e8

diff --git a/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
index afa3882f2..b54edea3f 100644
--- a/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
+++ b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
@@ -34,6 +34,8 @@
 #include "SMESH_Mesh.hxx"
 #include "Utils_SALOME_Exception.hxx"
 
+class SMDS_MeshNode;
+
 typedef struct uvPtStruct
 {
   double param;
@@ -42,7 +44,7 @@ typedef struct uvPtStruct
   double v;
   double x; // 2d parameter, normalized [0,1]
   double y; 
-	const SMDS_MeshNode * node;
+  const SMDS_MeshNode * node;
 } UVPtStruct;
 
 typedef struct faceQuadStruct
@@ -52,6 +54,7 @@ typedef struct faceQuadStruct
   double first[4];
   double last[4];
   bool isEdgeForward[4];
+  bool isEdgeOut[4]; // true, if an edge has more nodes, than the opposite
   UVPtStruct* uv_edges[4];
   UVPtStruct* uv_grid;
 } FaceQuadStruct;
@@ -75,7 +78,7 @@ public:
 				    const TopoDS_Shape& aShape)
     throw (SALOME_Exception);
 
-  void QuadDelete(FaceQuadStruct* quad);
+  static void QuadDelete(FaceQuadStruct* quad);
 
   ostream & SaveTo(ostream & save);
   istream & LoadFrom(istream & load);
@@ -90,13 +93,12 @@ protected:
     throw (SALOME_Exception);
 
   UVPtStruct* LoadEdgePoints(SMESH_Mesh& aMesh,
-			     const TopoDS_Face& F,
-			     const TopoDS_Edge& E,
-			     double first,
-			     double last);
-// 			     bool isForward);
+			     const TopoDS_Face& F, const TopoDS_Edge& E,
+			     double first, double last);
 
-//   FaceQuadStruct _quadDesc;
+  UVPtStruct* MakeEdgePoints(SMESH_Mesh& aMesh,
+			     const TopoDS_Face& F, const TopoDS_Edge& E,
+			     double first, double last, int nb_segm);
 };
 
 #endif