X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_Quadrangle_2D.hxx;h=56741ec764f008fdaea8731d81e083a5a9035355;hb=30be868bcd0dd1bea604af475f08f9107db292d2;hp=18c1daeca8183eac0a60275544a92622b1d96c3e;hpb=0635c9fc80f67d1e5dc0e94ec85f487286a92070;p=modules%2Fsmesh.git

diff --git a/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
index 18c1daeca..56741ec76 100644
--- a/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
+++ b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  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
@@ -25,12 +25,14 @@
 //  Author : Paul RASCLE, EDF
 //  Module : SMESH
 //  $Header$
-//
+
 #ifndef _SMESH_QUADRANGLE_2D_HXX_
 #define _SMESH_QUADRANGLE_2D_HXX_
 
 #include "SMESH_StdMeshers.hxx"
 
+#include "StdMeshers_QuadrangleParams.hxx"
+
 #include "SMESH_2D_Algo.hxx"
 #include "Utils_SALOME_Exception.hxx"
 
@@ -63,10 +65,13 @@ public:
                                SMESH_Hypothesis::Hypothesis_Status& aStatus);
 
   virtual bool Compute(SMESH_Mesh& aMesh,
-		       const TopoDS_Shape& aShape);
+                       const TopoDS_Shape& aShape);
+
+  virtual bool Evaluate(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape,
+                        MapShapeNbElems& aResMap);
 
   FaceQuadStruct* CheckAnd2Dcompute(SMESH_Mesh& aMesh,
-				    const TopoDS_Shape& aShape,
+                                    const TopoDS_Shape& aShape,
                                     const bool CreateQuadratic);
 
 protected:
@@ -74,9 +79,15 @@ protected:
   FaceQuadStruct* CheckNbEdges(SMESH_Mesh& aMesh,
                                const TopoDS_Shape& aShape);
 
+  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);
+                         const TopoDS_Shape& aShape,
+                         FaceQuadStruct*& quad);
   
   void SplitQuad(SMESHDS_Mesh *theMeshDS,
                  const int theFaceID,
@@ -89,29 +100,43 @@ protected:
    * Special function for creation only quandrangle faces
    */
   bool ComputeQuadPref(SMESH_Mesh& aMesh,
-                       
                        const TopoDS_Shape& aShape,
                        FaceQuadStruct* quad);
 
+  bool EvaluateQuadPref(SMESH_Mesh& aMesh,
+                        const TopoDS_Shape& aShape,
+                        std::vector<int>& aNbNodes,
+                        MapShapeNbElems& aResMap,
+                        bool IsQuadratic);
+
   UVPtStruct* LoadEdgePoints2(SMESH_Mesh& aMesh,
-			      const TopoDS_Face& F, const TopoDS_Edge& E,
+                              const TopoDS_Face& F, const TopoDS_Edge& E,
                               bool IsReverse);
 
   UVPtStruct* LoadEdgePoints(SMESH_Mesh& aMesh,
-			     const TopoDS_Face& F, const TopoDS_Edge& E,
-			     double first, double last);
+                             const TopoDS_Face& F, const TopoDS_Edge& E,
+                             double first, double last);
 
   UVPtStruct* MakeEdgePoints(SMESH_Mesh& aMesh,
-			     const TopoDS_Face& F, const TopoDS_Edge& E,
-			     double first, double last, int nb_segm);
+                             const TopoDS_Face& F, const TopoDS_Edge& E,
+                             double first, double last, int nb_segm);
+
+  bool ComputeReduced (SMESH_Mesh& aMesh,
+                       const TopoDS_Shape& aShape,
+                       FaceQuadStruct* quad);
 
   // true if QuadranglePreference hypothesis is assigned that forces
   // construction of quadrangles if the number of nodes on opposite edges
-  // is not the same in the case where the global number of nodes on edges is even
+  // 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* myTool; // tool for working with quadratic elements
 };