X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_Hexa_3D.hxx;h=f4608a79a247571c5790674ffbb2ec6c40f44f91;hb=9150fb3db9f16daea68ed8b24447aaadc171b61e;hp=6ee4afb269fb04ec69f496bc855bd9b4b2f882b2;hpb=57b43b4d010e2d0a1529d3c131bbb9d416e63258;p=modules%2Fsmesh.git

diff --git a/src/StdMeshers/StdMeshers_Hexa_3D.hxx b/src/StdMeshers/StdMeshers_Hexa_3D.hxx
index 6ee4afb26..f4608a79a 100644
--- a/src/StdMeshers/StdMeshers_Hexa_3D.hxx
+++ b/src/StdMeshers/StdMeshers_Hexa_3D.hxx
@@ -1,34 +1,36 @@
-//  SMESH SMESH : implementaion of SMESH idl descriptions
+//  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
+//
+//  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.
 //
-//  Copyright (C) 2003  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 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 
-// 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//  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
 //
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
+//  SMESH SMESH : implementaion of SMESH idl descriptions
 //  File   : StdMeshers_Hexa_3D.hxx
 //           Moved here from SMESH_Hexa_3D.hxx
 //  Author : Paul RASCLE, EDF
 //  Module : SMESH
-
+//
 #ifndef _SMESH_HEXA_3D_HXX_
 #define _SMESH_HEXA_3D_HXX_
 
+#include "SMESH_StdMeshers.hxx"
+
 #include "SMESH_3D_Algo.hxx"
 #include "SMESH_Mesh.hxx"
 #include "StdMeshers_Quadrangle_2D.hxx"
@@ -36,6 +38,8 @@
 
 #include "SMESH_MesherHelper.hxx"
 
+class TopTools_IndexedMapOfShape;
+
 typedef struct point3Dstruct
 {
   const SMDS_MeshNode * node;
@@ -59,7 +63,7 @@ typedef struct conv2dstruct
   int jc;
 } Conv2DStruct;
 
-class StdMeshers_Hexa_3D:
+class STDMESHERS_EXPORT StdMeshers_Hexa_3D:
   public SMESH_3D_Algo
 {
 public:
@@ -70,44 +74,46 @@ public:
                                const TopoDS_Shape& aShape,
                                SMESH_Hypothesis::Hypothesis_Status& aStatus);
 
-  virtual bool Compute(SMESH_Mesh& aMesh,
-		       const TopoDS_Shape& aShape)
-    throw (SALOME_Exception);
+  virtual bool Compute(SMESH_Mesh& aMesh,  const TopoDS_Shape& aShape);
+
+  virtual bool Compute(SMESH_Mesh & aMesh, SMESH_MesherHelper* aHelper);
+
+  virtual bool Evaluate(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape,
+                        MapShapeNbElems& aResMap);
 
-  ostream & SaveTo(ostream & save);
-  istream & LoadFrom(istream & load);
-  friend ostream & operator << (ostream & save, StdMeshers_Hexa_3D & hyp);
-  friend istream & operator >> (istream & load, StdMeshers_Hexa_3D & hyp);
+  static TopoDS_Vertex OppositeVertex(const TopoDS_Vertex& aVertex,
+                                      const TopTools_IndexedMapOfShape& aQuads0Vertices,
+                                      FaceQuadStruct* aQuads[6]);
 
 protected:
   TopoDS_Edge
   EdgeNotInFace(SMESH_Mesh& aMesh,
-		const TopoDS_Shape& aShape,
-		const TopoDS_Face& aFace,
-		const TopoDS_Vertex& aVertex,
-		const TopTools_IndexedDataMapOfShapeListOfShape& MS);
+                const TopoDS_Shape& aShape,
+                const TopoDS_Face& aFace,
+                const TopoDS_Vertex& aVertex,
+                const TopTools_IndexedDataMapOfShapeListOfShape& MS);
 
   int GetFaceIndex(SMESH_Mesh& aMesh,
-		   const TopoDS_Shape& aShape,
-		   const vector<SMESH_subMesh*>& meshFaces,
-		   const TopoDS_Vertex& V0,
-		   const TopoDS_Vertex& V1,
-		   const TopoDS_Vertex& V2,
-		   const TopoDS_Vertex& V3);
+                   const TopoDS_Shape& aShape,
+                   const std::vector<SMESH_subMesh*>& meshFaces,
+                   const TopoDS_Vertex& V0,
+                   const TopoDS_Vertex& V1,
+                   const TopoDS_Vertex& V2,
+                   const TopoDS_Vertex& V3);
 
   void GetConv2DCoefs(const faceQuadStruct& quad,
-		      const TopoDS_Shape& aShape,
-		      const TopoDS_Vertex& V0,
-		      const TopoDS_Vertex& V1,
-		      const TopoDS_Vertex& V2,
-		      const TopoDS_Vertex& V3,
-		      Conv2DStruct& conv);
+                      const TopoDS_Shape& aShape,
+                      const TopoDS_Vertex& V0,
+                      const TopoDS_Vertex& V1,
+                      const TopoDS_Vertex& V2,
+                      const TopoDS_Vertex& V3,
+                      Conv2DStruct& conv);
 
   void GetPoint(Pt3 p,
-		int i, int j, int k,
-		int nbx, int nby, int nbz,
-		Point3DStruct *np,
-		const SMESHDS_Mesh* meshDS);
+                int i, int j, int k,
+                int nbx, int nby, int nbz,
+                Point3DStruct *np,
+                const SMESHDS_Mesh* meshDS);
 
   bool ClearAndReturn(FaceQuadStruct* theQuads[6], const bool res);
 };