X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_Quadrangle_2D.hxx;h=bf1fdde46fc6a2cda146f18339e2f032fc09ebbf;hb=2b3a86e7ca1e373692ae6b2ebb691ff412e0f634;hp=74c64f6f087e2aa3c09de93c4f2f93103e013f78;hpb=9357f5c87098aff2b95b754d69f66c76d2df9c24;p=modules%2Fsmesh.git

diff --git a/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
index 74c64f6f0..bf1fdde46 100644
--- a/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
+++ b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
@@ -1,37 +1,37 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2011  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
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
-//  SMESH SMESH : implementaion of SMESH idl descriptions
 //  File   : StdMeshers_Quadrangle_2D.hxx
 //           Moved here from SMESH_Quadrangle_2D.hxx
 //  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"
 
@@ -39,6 +39,7 @@ class SMESH_Mesh;
 class SMESH_MesherHelper;
 class StdMeshers_FaceSide;
 class SMDS_MeshNode;
+class TopoDS_Face;
 struct uvPtStruct;
 
 
@@ -50,6 +51,7 @@ typedef struct faceQuadStruct
   std::vector< StdMeshers_FaceSide*> side;
   bool isEdgeOut[4]; // true, if an edge has more nodes, than the opposite
   UVPtStruct* uv_grid;
+  TopoDS_Face face;
   ~faceQuadStruct();
 } FaceQuadStruct;
 
@@ -73,11 +75,11 @@ public:
                                     const TopoDS_Shape& aShape,
                                     const bool CreateQuadratic);
 
-protected:
-
   FaceQuadStruct* CheckNbEdges(SMESH_Mesh& aMesh,
                                const TopoDS_Shape& aShape);
 
+protected:
+
   bool CheckNbEdgesForEvaluate(SMESH_Mesh& aMesh,
                                const TopoDS_Shape & aShape,
                                MapShapeNbElems& aResMap,
@@ -95,9 +97,6 @@ protected:
                  const SMDS_MeshNode* theNode3,
                  const SMDS_MeshNode* theNode4);
 
-  /**
-   * Special function for creation only quandrangle faces
-   */
   bool ComputeQuadPref(SMESH_Mesh& aMesh,
                        const TopoDS_Shape& aShape,
                        FaceQuadStruct* quad);
@@ -108,17 +107,14 @@ protected:
                         MapShapeNbElems& aResMap,
                         bool IsQuadratic);
 
-  UVPtStruct* LoadEdgePoints2(SMESH_Mesh& aMesh,
-                              const TopoDS_Face& F, const TopoDS_Edge& E,
-                              bool IsReverse);
+  bool ComputeReduced (SMESH_Mesh& aMesh,
+                       const TopoDS_Shape& aShape,
+                       FaceQuadStruct* quad);
+
+  void UpdateDegenUV(FaceQuadStruct* quad);
 
-  UVPtStruct* LoadEdgePoints(SMESH_Mesh& aMesh,
-                             const TopoDS_Face& F, const TopoDS_Edge& E,
-                             double first, double last);
+  void Smooth (FaceQuadStruct* quad);
 
-  UVPtStruct* MakeEdgePoints(SMESH_Mesh& aMesh,
-                             const TopoDS_Face& F, const TopoDS_Edge& E,
-                             double first, double last, int nb_segm);
 
   // true if QuadranglePreference hypothesis is assigned that forces
   // construction of quadrangles if the number of nodes on opposite edges
@@ -130,7 +126,11 @@ protected:
 
   int myTriaVertexID;
 
-  SMESH_MesherHelper* myTool; // tool for working with quadratic elements
+  StdMeshers_QuadType myQuadType;
+
+  SMESH_MesherHelper* myHelper; // tool for working with quadratic elements
+
+  bool myNeedSmooth;
 };
 
 #endif