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 371e6b63c139953df4aa14f99862d91f0d739864..54a2a066408b1961c11df8f09d302f767c60f39c 100644 (file)
--- a/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
+++ b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
@@ -78,50 +78,56 @@ public:
                                         const bool          CreateQuadratic);
 
   FaceQuadStruct::Ptr CheckNbEdges(SMESH_Mesh&         aMesh,
-                                   const TopoDS_Shape& aShape);
+                                   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,
+  int getCorners(const TopoDS_Face&          theFace,
                  SMESH_Mesh &                theMesh,
                  std::list<TopoDS_Edge>&     theWire,
                  std::vector<TopoDS_Vertex>& theVertices,
-                 int &                       theNbDegenEdges);
+                 int &                       theNbDegenEdges,
+                 const bool                  considerMesh);
 
 
   // true if QuadranglePreference hypothesis is assigned that forces