X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_Quadrangle_2D.hxx;h=5233cf9fd2e3a09af11d30a073a81ddc8aa67ca7;hb=14e837696393fd873427c02268fffe8925c88b0c;hp=e200bc5af1b26554b27cb421fef6bfa220731499;hpb=f5016d85b7b4b88623723027a1585c6414c4dc66;p=modules%2Fsmesh.git

diff --git a/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
index e200bc5af..5233cf9fd 100644
--- a/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
+++ b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -27,32 +27,33 @@
 #ifndef _SMESH_QUADRANGLE_2D_HXX_
 #define _SMESH_QUADRANGLE_2D_HXX_
 
+#include "SMESH_Algo.hxx"
+#include "SMESH_ProxyMesh.hxx"
 #include "SMESH_StdMeshers.hxx"
-
 #include "StdMeshers_QuadrangleParams.hxx"
 
-#include "SMESH_Algo.hxx"
-#include "Utils_SALOME_Exception.hxx"
-
 #include <TopoDS_Face.hxx>
 
+class SMDS_MeshNode;
 class SMESH_Mesh;
 class SMESH_MesherHelper;
+class SMESH_ProxyMesh;
 class StdMeshers_FaceSide;
-class SMDS_MeshNode;
 struct uvPtStruct;
 
 
-enum TSideID { BOTTOM_SIDE=0, RIGHT_SIDE, TOP_SIDE, LEFT_SIDE, NB_SIDES };
+enum TSideID { QUAD_BOTTOM_SIDE=0, QUAD_RIGHT_SIDE, QUAD_TOP_SIDE, QUAD_LEFT_SIDE, NB_QUAD_SIDES };
 
 typedef uvPtStruct UVPtStruct;
 typedef struct faceQuadStruct
 {
   std::vector< StdMeshers_FaceSide*> side;
-  bool isEdgeOut[4]; // true, if an edge has more nodes, than the opposite
+  bool isEdgeOut[4]; // true, if an EDGE has more nodes, than an opposite one
   UVPtStruct* uv_grid;
   TopoDS_Face face;
   ~faceQuadStruct();
+  void shift( size_t nb, bool keepUnitOri );
+  typedef boost::shared_ptr<faceQuadStruct> Ptr;
 } FaceQuadStruct;
 
 class STDMESHERS_EXPORT StdMeshers_Quadrangle_2D: public SMESH_2D_Algo
@@ -71,12 +72,12 @@ public:
   virtual bool Evaluate(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape,
                         MapShapeNbElems& aResMap);
 
-  FaceQuadStruct* CheckAnd2Dcompute(SMESH_Mesh& aMesh,
-                                    const TopoDS_Shape& aShape,
-                                    const bool CreateQuadratic);
+  FaceQuadStruct::Ptr CheckAnd2Dcompute(SMESH_Mesh& aMesh,
+                                        const TopoDS_Shape& aShape,
+                                        const bool CreateQuadratic);
 
-  FaceQuadStruct* CheckNbEdges(SMESH_Mesh& aMesh,
-                               const TopoDS_Shape& aShape);
+  FaceQuadStruct::Ptr CheckNbEdges(SMESH_Mesh& aMesh,
+                                   const TopoDS_Shape& aShape);
 
 protected:
 
@@ -86,9 +87,9 @@ protected:
                                std::vector<int>& aNbNodes,
                                bool& IsQuadratic);
 
-  bool SetNormalizedGrid(SMESH_Mesh& aMesh,
-                         const TopoDS_Shape& aShape,
-                         FaceQuadStruct*& quad);
+  bool SetNormalizedGrid(SMESH_Mesh&          aMesh,
+                         const TopoDS_Shape&  aShape,
+                         FaceQuadStruct::Ptr& quad);
   
   void SplitQuad(SMESHDS_Mesh *theMeshDS,
                  const int theFaceID,
@@ -97,23 +98,23 @@ protected:
                  const SMDS_MeshNode* theNode3,
                  const SMDS_MeshNode* theNode4);
 
-  bool ComputeQuadPref(SMESH_Mesh& aMesh,
+  bool ComputeQuadPref(SMESH_Mesh&         aMesh,
                        const TopoDS_Shape& aShape,
-                       FaceQuadStruct* quad);
+                       FaceQuadStruct::Ptr quad);
 
-  bool EvaluateQuadPref(SMESH_Mesh& aMesh,
+  bool EvaluateQuadPref(SMESH_Mesh&         aMesh,
                         const TopoDS_Shape& aShape,
-                        std::vector<int>& aNbNodes,
-                        MapShapeNbElems& aResMap,
-                        bool IsQuadratic);
+                        std::vector<int>&   aNbNodes,
+                        MapShapeNbElems&    aResMap,
+                        bool                isQuadratic);
 
-  bool ComputeReduced (SMESH_Mesh& aMesh,
+  bool ComputeReduced (SMESH_Mesh&         aMesh,
                        const TopoDS_Shape& aShape,
-                       FaceQuadStruct* quad);
+                       FaceQuadStruct::Ptr quad);
 
-  void UpdateDegenUV(FaceQuadStruct* quad);
+  void UpdateDegenUV(FaceQuadStruct::Ptr quad);
 
-  void Smooth (FaceQuadStruct* quad);
+  void Smooth (FaceQuadStruct::Ptr quad);
 
 
   // true if QuadranglePreference hypothesis is assigned that forces
@@ -124,13 +125,17 @@ protected:
 
   bool myTrianglePreference;
 
-  int myTriaVertexID;
+  int  myTriaVertexID;
 
-  StdMeshers_QuadType myQuadType;
+  bool myNeedSmooth;
 
-  SMESH_MesherHelper* myHelper; // tool for working with quadratic elements
+  StdMeshers_QuadType  myQuadType;
 
-  bool myNeedSmooth;
+  SMESH_MesherHelper*  myHelper; // tool for working with quadratic elements
+
+  SMESH_ProxyMesh::Ptr myProxyMesh;
+
+  FaceQuadStruct::Ptr  myQuadStruct;
 };
 
 #endif