From: eap <eap@opencascade.com>
Date: Wed, 26 Jan 2011 14:08:42 +0000 (+0000)
Subject: For redesigned StdMeshers_Hexa_3D (to work with composed cube edges)
X-Git-Tag: StartingPortingMED3~115
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0df1e71b77e91f3e9419931c792a0dd54934ddca;p=modules%2Fsmesh.git

For redesigned StdMeshers_Hexa_3D (to work with composed cube edges)
1) Store TopoDS_Face in FaceQuadStruct
2) Make CheckNbEdges() public
---

diff --git a/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx b/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx
index 174a24411..8dfaf24c1 100644
--- a/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx
+++ b/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx
@@ -792,6 +792,7 @@ FaceQuadStruct* StdMeshers_Quadrangle_2D::CheckNbEdges(SMESH_Mesh &         aMes
   FaceQuadStruct* quad = new FaceQuadStruct;
   quad->uv_grid = 0;
   quad->side.reserve(nbEdgesInWire.front());
+  quad->face = F;
 
   int nbSides = 0;
   list< TopoDS_Edge >::iterator edgeIt = edges.begin();
diff --git a/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
index 56741ec76..ed22821a9 100644
--- a/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
+++ b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
@@ -51,6 +51,7 @@ typedef struct faceQuadStruct
   std::vector< StdMeshers_FaceSide*> side;
   bool isEdgeOut[4]; // true, if an edge has more nodes, than the opposite
   UVPtStruct* uv_grid;
+  TopoDS_Face face;
   ~faceQuadStruct();
 } FaceQuadStruct;
 
@@ -74,11 +75,11 @@ public:
                                     const TopoDS_Shape& aShape,
                                     const bool CreateQuadratic);
 
-protected:
-
   FaceQuadStruct* CheckNbEdges(SMESH_Mesh& aMesh,
                                const TopoDS_Shape& aShape);
 
+protected:
+
   bool CheckNbEdgesForEvaluate(SMESH_Mesh& aMesh,
                                const TopoDS_Shape & aShape,
                                MapShapeNbElems& aResMap,