X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_Quadrangle_2D.hxx;h=8ee2c77c352f286797e2b3a8f367fabd0c1c18ba;hb=7e350caa2f1f4cbb2f3d948558c2710d73e76136;hp=b54edea3f34a53a50928a7278677ccbd59f51409;hpb=9b89dd05caeedb6d650bafe425429a7986d5c788;p=modules%2Fsmesh.git

diff --git a/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
index b54edea3f..8ee2c77c3 100644
--- a/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
+++ b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
@@ -17,7 +17,7 @@
 //  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
@@ -31,36 +31,27 @@
 #define _SMESH_QUADRANGLE_2D_HXX_
 
 #include "SMESH_2D_Algo.hxx"
-#include "SMESH_Mesh.hxx"
 #include "Utils_SALOME_Exception.hxx"
 
-class SMDS_MeshNode;
+class SMESH_Mesh;
+class SMESH_MesherHelper;
+class StdMeshers_FaceSide;
+struct uvPtStruct;
 
-typedef struct uvPtStruct
-{
-  double param;
-  double normParam;
-  double u; // original 2d parameter
-  double v;
-  double x; // 2d parameter, normalized [0,1]
-  double y; 
-  const SMDS_MeshNode * node;
-} UVPtStruct;
+//class SMDS_MeshNode;
+
+enum TSideID { BOTTOM_SIDE=0, RIGHT_SIDE, TOP_SIDE, LEFT_SIDE, NB_SIDES };
 
+typedef uvPtStruct UVPtStruct;
 typedef struct faceQuadStruct
 {
-  int nbPts[4];
-  TopoDS_Edge edge[4];
-  double first[4];
-  double last[4];
-  bool isEdgeForward[4];
+  vector< StdMeshers_FaceSide*> side;
   bool isEdgeOut[4]; // true, if an edge has more nodes, than the opposite
-  UVPtStruct* uv_edges[4];
   UVPtStruct* uv_grid;
+  ~faceQuadStruct();
 } FaceQuadStruct;
 
-class StdMeshers_Quadrangle_2D:
-  public SMESH_2D_Algo
+class StdMeshers_Quadrangle_2D: public SMESH_2D_Algo
 {
 public:
   StdMeshers_Quadrangle_2D(int hypId, int studyId, SMESH_Gen* gen);
@@ -71,26 +62,31 @@ public:
                                SMESH_Hypothesis::Hypothesis_Status& aStatus);
 
   virtual bool Compute(SMESH_Mesh& aMesh,
-		       const TopoDS_Shape& aShape)
-    throw (SALOME_Exception);
+		       const TopoDS_Shape& aShape);
 
   FaceQuadStruct* CheckAnd2Dcompute(SMESH_Mesh& aMesh,
-				    const TopoDS_Shape& aShape)
-    throw (SALOME_Exception);
-
-  static void QuadDelete(FaceQuadStruct* quad);
-
-  ostream & SaveTo(ostream & save);
-  istream & LoadFrom(istream & load);
-  friend ostream & operator << (ostream & save, StdMeshers_Quadrangle_2D & hyp);
-  friend istream & operator >> (istream & load, StdMeshers_Quadrangle_2D & hyp);
+				    const TopoDS_Shape& aShape,
+                                    const bool CreateQuadratic);
 
 protected:
 
-  void SetNormalizedGrid(SMESH_Mesh& aMesh,
+  FaceQuadStruct* CheckNbEdges(SMESH_Mesh& aMesh,
+                               const TopoDS_Shape& aShape);
+
+  bool SetNormalizedGrid(SMESH_Mesh& aMesh,
 			 const TopoDS_Shape& aShape,
-			 FaceQuadStruct* quad)
-    throw (SALOME_Exception);
+			 FaceQuadStruct*& quad);
+
+  /**
+   * Special function for creation only quandrangle faces
+   */
+  bool ComputeQuadPref(SMESH_Mesh& aMesh,
+                       const TopoDS_Shape& aShape,
+                       FaceQuadStruct* quad);
+
+  UVPtStruct* LoadEdgePoints2(SMESH_Mesh& aMesh,
+			      const TopoDS_Face& F, const TopoDS_Edge& E,
+                              bool IsReverse);
 
   UVPtStruct* LoadEdgePoints(SMESH_Mesh& aMesh,
 			     const TopoDS_Face& F, const TopoDS_Edge& E,
@@ -99,6 +95,13 @@ protected:
   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
+  // is not the same in the case where the global number of nodes on edges is even
+  bool myQuadranglePreference;
+
+  SMESH_MesherHelper* myTool; // tool for working with quadratic elements
 };
 
 #endif