X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_MEFISTO_2D.hxx;h=5b27addcc4987d4df1110fb8880ef2df1346e0b0;hb=43f6820017b9637defddd672635ef74acef1a609;hp=38753d6bdbdd428a58271bda86d6b7fb9d6e5c35;hpb=c3bf92bd87b770fd81631a3853f7f5bb1ac6a4e8;p=modules%2Fsmesh.git

diff --git a/src/StdMeshers/StdMeshers_MEFISTO_2D.hxx b/src/StdMeshers/StdMeshers_MEFISTO_2D.hxx
index 38753d6bd..5b27addcc 100644
--- a/src/StdMeshers/StdMeshers_MEFISTO_2D.hxx
+++ b/src/StdMeshers/StdMeshers_MEFISTO_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,13 +31,21 @@
 #define _StdMeshers_MEFISTO_2D_HXX_
 
 #include "SMESH_2D_Algo.hxx"
-#include "StdMeshers_MaxElementArea.hxx"
-#include "StdMeshers_LengthFromEdges.hxx"
-#include "Rn.h"
+#include <TopoDS_Wire.hxx>
+
+#include "SMESH_MesherHelper.hxx"
 
 class SMDS_MeshNode;
-#include <TopoDS_Face.hxx>
+class TopTools_IndexedDataMapOfShapeListOfShape;
+class TopoDS_Face;
+class TopoDS_WIre;
+class StdMeshers_MaxElementArea;
+class StdMeshers_LengthFromEdges;
+class SMDS_MeshNode;
+
+#include <list>
 #include <map>
+#include "Rn.h"
 
 class StdMeshers_MEFISTO_2D:
   public SMESH_2D_Algo
@@ -56,12 +64,14 @@ public:
   double ComputeEdgeElementLength(SMESH_Mesh& aMesh,
 				  const TopoDS_Shape& aShape);
 
-  void LoadPoints(SMESH_Mesh& aMesh,
+  bool LoadPoints(SMESH_Mesh& aMesh,
 		  const TopoDS_Face& F, 
 		  const TopoDS_Wire& W,
 		  R2* uvslf, 
 		  int& m,
-		  map<int,const SMDS_MeshNode*>& mefistoToDS);
+		  map<int,const SMDS_MeshNode*>& mefistoToDS,
+                  double scalex, double scaley,
+                  const TopTools_IndexedDataMapOfShapeListOfShape& VWMap);
 
   void ComputeScaleOnFace(SMESH_Mesh& aMesh,
 			  const TopoDS_Face& aFace,
@@ -71,7 +81,8 @@ public:
   void StoreResult (SMESH_Mesh& aMesh,
 		    Z nbst, R2* uvst, Z nbt, Z* nust, 
 		    const TopoDS_Face& F, bool faceIsForward,
-		    map<int,const SMDS_MeshNode*>& mefistoToDS);
+		    map<int,const SMDS_MeshNode*>& mefistoToDS,
+                    double scalex, double scaley);
 					  
   ostream & SaveTo(ostream & save);
   istream & LoadFrom(istream & load);
@@ -79,10 +90,15 @@ public:
   friend istream & operator >> (istream & load, StdMeshers_MEFISTO_2D & hyp);
 
 protected:
-  double _edgeLength;
-  double _maxElementArea;
-  const StdMeshers_MaxElementArea* _hypMaxElementArea;
+  double                            _edgeLength;
+  double                            _maxElementArea;
+  const StdMeshers_MaxElementArea*  _hypMaxElementArea;
   const StdMeshers_LengthFromEdges* _hypLengthFromEdges;
+
+  TopoDS_Wire myOuterWire;
+  std::list<const SMDS_MeshNode*> myNodesOnCommonV;
+
+  SMESH_MesherHelper* myTool; // toll for working with quadratic elements
 };
 
 #endif