22419: EDF SMESH Regression: 3D Extrusion fails

[modules/smesh.git] / src / StdMeshers / StdMeshers_Quadrangle_2D.hxx

diff --git a/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
index 6ffe0e68f325c36f2fc0a003d87d7d9076105dcb..54a2a066408b1961c11df8f09d302f767c60f39c 100644 (file)
--- 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
@@ -62,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::Ptr CheckAnd2Dcompute(SMESH_Mesh& aMesh,
+  FaceQuadStruct::Ptr CheckAnd2Dcompute(SMESH_Mesh&         aMesh,
                                         const TopoDS_Shape& aShape,
-                                        const bool CreateQuadratic);
+                                        const bool          CreateQuadratic);
 
-  FaceQuadStruct::Ptr 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,
+  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,
+  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);
 
-  bool ComputeReduced (SMESH_Mesh&         aMesh,
-                       const TopoDS_Shape& aShape,
+  bool computeReduced (SMESH_Mesh&         aMesh,
+                       const TopoDS_Face&  aFace,
                        FaceQuadStruct::Ptr quad);
 
-  void UpdateDegenUV(FaceQuadStruct::Ptr quad);
+  void updateDegenUV(FaceQuadStruct::Ptr quad);
+
+  void smooth (FaceQuadStruct::Ptr quad);
 
-  void Smooth (FaceQuadStruct::Ptr 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
@@ -122,19 +135,13 @@ protected:
   // is not the same in the case where the global number of nodes on edges
   // is even
   bool myQuadranglePreference;
-
   bool myTrianglePreference;
-
   int  myTriaVertexID;
-
   bool myNeedSmooth;
 
   StdMeshers_QuadType  myQuadType;
-
   SMESH_MesherHelper*  myHelper; // tool for working with quadratic elements
-
   SMESH_ProxyMesh::Ptr myProxyMesh;
-
   FaceQuadStruct::Ptr  myQuadStruct;
 };