Salome HOME
22419: EDF SMESH Regression: 3D Extrusion fails
[modules/smesh.git] / src / StdMeshers / StdMeshers_Quadrangle_2D.hxx
index 3f9202e86dbe883584ec0db8a95bfdd6b2d7c1db..54a2a066408b1961c11df8f09d302f767c60f39c 100644 (file)
@@ -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
 #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_2D_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
@@ -61,59 +62,72 @@ public:
   StdMeshers_Quadrangle_2D(int hypId, int studyId, SMESH_Gen* gen);
   virtual ~StdMeshers_Quadrangle_2D();
 
-  virtual bool CheckHypothesis(SMESH_Mesh& aMesh,
+  virtual bool CheckHypothesis(SMESH_Mesh&         aMesh,
                                const TopoDS_Shape& aShape,
-                               SMESH_Hypothesis::Hypothesis_Status& aStatus);
+                               Hypothesis_Status&  aStatus);
 
-  virtual bool Compute(SMESH_Mesh& aMesh,
+  virtual bool Compute(SMESH_Mesh&         aMesh,
                        const TopoDS_Shape& aShape);
 
-  virtual bool Evaluate(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape,
-                        MapShapeNbElems& aResMap);
+  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,
+                                   const bool          considerMesh=false);
 
 protected:
 
-  bool CheckNbEdgesForEvaluate(SMESH_Mesh& aMesh,
+  bool checkNbEdgesForEvaluate(SMESH_Mesh& aMesh,
                                const TopoDS_Shape & aShape,
                                MapShapeNbElems& aResMap,
                                std::vector<int>& aNbNodes,
                                bool& IsQuadratic);
 
-  bool SetNormalizedGrid(SMESH_Mesh& aMesh,
-                         const TopoDS_Shape& aShape,
-                         FaceQuadStruct*& quad);
+  bool setNormalizedGrid(SMESH_Mesh&          aMesh,
+                         const TopoDS_Face&   aFace,
+                         FaceQuadStruct::Ptr& quad);
   
-  void SplitQuad(SMESHDS_Mesh *theMeshDS,
+  void splitQuad(SMESHDS_Mesh *theMeshDS,
                  const int theFaceID,
                  const SMDS_MeshNode* theNode1,
                  const SMDS_MeshNode* theNode2,
                  const SMDS_MeshNode* theNode3,
                  const SMDS_MeshNode* theNode4);
 
-  bool ComputeQuadPref(SMESH_Mesh& aMesh,
-                       const TopoDS_Shape& aShape,
-                       FaceQuadStruct* quad);
+  bool computeQuadDominant(SMESH_Mesh&         aMesh,
+                           const TopoDS_Face&  aFace,
+                           FaceQuadStruct::Ptr quad);
+
+  bool computeQuadPref(SMESH_Mesh&         aMesh,
+                       const TopoDS_Face&  aFace,
+                       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,
+                       const TopoDS_Face&  aFace,
+                       FaceQuadStruct::Ptr quad);
 
-  bool ComputeReduced (SMESH_Mesh& aMesh,
-                       const TopoDS_Shape& aShape,
-                       FaceQuadStruct* quad);
+  void updateDegenUV(FaceQuadStruct::Ptr quad);
 
-  void UpdateDegenUV(FaceQuadStruct* quad);
+  void smooth (FaceQuadStruct::Ptr quad);
 
-  void Smooth (FaceQuadStruct* quad);
+  int getCorners(const TopoDS_Face&          theFace,
+                 SMESH_Mesh &                theMesh,
+                 std::list<TopoDS_Edge>&     theWire,
+                 std::vector<TopoDS_Vertex>& theVertices,
+                 int &                       theNbDegenEdges,
+                 const bool                  considerMesh);
 
 
   // true if QuadranglePreference hypothesis is assigned that forces
@@ -121,16 +135,14 @@ protected:
   // is not the same in the case where the global number of nodes on edges
   // is even
   bool myQuadranglePreference;
-
   bool myTrianglePreference;
-
-  int myTriaVertexID;
-
-  StdMeshers_QuadType myQuadType;
-
-  SMESH_MesherHelper* myHelper; // tool for working with quadratic elements
-
+  int  myTriaVertexID;
   bool myNeedSmooth;
+
+  StdMeshers_QuadType  myQuadType;
+  SMESH_MesherHelper*  myHelper; // tool for working with quadratic elements
+  SMESH_ProxyMesh::Ptr myProxyMesh;
+  FaceQuadStruct::Ptr  myQuadStruct;
 };
 
 #endif