X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_MEFISTO_2D.hxx;h=0940356239c3d3dd9e75250ca44cd0eede0e861c;hp=fba4b2d3480daf6099a4011f57802cf70f80317e;hb=a274ade365bd0f0e19d56c577acc4a13aa1972a7;hpb=0635c9fc80f67d1e5dc0e94ec85f487286a92070

diff --git a/src/StdMeshers/StdMeshers_MEFISTO_2D.hxx b/src/StdMeshers/StdMeshers_MEFISTO_2D.hxx
index fba4b2d34..094035623 100644
--- a/src/StdMeshers/StdMeshers_MEFISTO_2D.hxx
+++ b/src/StdMeshers/StdMeshers_MEFISTO_2D.hxx
@@ -1,37 +1,37 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2021  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, or (at your option) any later version.
 //
-//  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
+
+//  SMESH SMESH : implementation of SMESH idl descriptions
 //  File   : StdMeshers_MEFISTO_2D.hxx
 //           Moved here from SMESH_MEFISTO_2D.hxx
 //  Author : Paul RASCLE, EDF
 //  Module : SMESH
-//  $Header$
 //
 #ifndef _StdMeshers_MEFISTO_2D_HXX_
 #define _StdMeshers_MEFISTO_2D_HXX_
 
 #include "SMESH_StdMeshers.hxx"
 
-#include "SMESH_2D_Algo.hxx"
+#include "SMESH_Algo.hxx"
 
 class TopoDS_Face;
 class StdMeshers_MaxElementArea;
@@ -47,7 +47,7 @@ class StdMeshers_FaceSide;
 class STDMESHERS_EXPORT StdMeshers_MEFISTO_2D: public SMESH_2D_Algo
 {
 public:
-  StdMeshers_MEFISTO_2D(int hypId, int studyId, SMESH_Gen* gen);
+  StdMeshers_MEFISTO_2D(int hypId, SMESH_Gen* gen);
   virtual ~StdMeshers_MEFISTO_2D();
 
   virtual bool CheckHypothesis(SMESH_Mesh& aMesh,
@@ -55,25 +55,28 @@ 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);
 
   typedef boost::shared_ptr< StdMeshers_FaceSide> StdMeshers_FaceSidePtr;
   typedef std::vector< StdMeshers_FaceSidePtr > TWireVector;
 
   bool LoadPoints(TWireVector &                       wires,
-		  R2*                                 uvslf, 
-		  std::vector< const SMDS_MeshNode*>& mefistoToDS,
+                  R2*                                 uvslf, 
+                  std::vector< const SMDS_MeshNode*>& mefistoToDS,
                   double scalex, double               scaley);
 
   void ComputeScaleOnFace(SMESH_Mesh& aMesh,
-			  const TopoDS_Face& aFace,
-			  double& scalex,
-			  double& scaley);
+                          const TopoDS_Face& aFace,
+                          double& scalex,
+                          double& scaley);
 
   void StoreResult (Z nbst, R2* uvst, Z nbt, Z* nust, 
-		    std::vector< const SMDS_MeshNode*>& mefistoToDS,
+                    std::vector< const SMDS_MeshNode*>& mefistoToDS,
                     double scalex, double scaley);
-					  
+                                          
 protected:
   double                            _edgeLength;
   double                            _maxElementArea;
@@ -82,7 +85,7 @@ protected:
 
   std::list<const SMDS_MeshNode*> myNodesOnCommonV;
 
-  SMESH_MesherHelper* myTool; // tool for working with quadratic elements
+  SMESH_MesherHelper* _helper; // tool for working with quadratic elements
 };
 
 #endif