Working version for run_mesher for netgen 3d

[plugins/netgenplugin.git] / src / NETGENPlugin / NETGENPlugin_NETGEN_2D_ONLY.hxx

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.hxx
index f4ff38f4fa675bc9d30fd00a9cc540d3ccc2467f..de61a7fb3707f6555480b85a60096d592f745b9a 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.hxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // 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.
+// 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
@@ -24,12 +24,15 @@
 #ifndef _NETGENPlugin_NETGEN_2D_ONLY_HXX_
 #define _NETGENPlugin_NETGEN_2D_ONLY_HXX_
 
+#include "NETGENPlugin_Provider.hxx"
+
 #include <SMESH_Algo.hxx>
 #include <SMESH_Mesh.hxx>
 
 class StdMeshers_MaxElementArea;
 class StdMeshers_LengthFromEdges;
 class NETGENPlugin_Hypothesis_2D;
+class NETGENPlugin_NetgenLibWrapper;
 
 /*!
  * \brief Mesher generating 2D elements on a geometrical face taking
@@ -42,7 +45,7 @@ class NETGENPlugin_Hypothesis_2D;
 class NETGENPlugin_NETGEN_2D_ONLY: public SMESH_2D_Algo
 {
 public:
-  NETGENPlugin_NETGEN_2D_ONLY(int hypId, int studyId, SMESH_Gen* gen);
+  NETGENPlugin_NETGEN_2D_ONLY(int hypId, SMESH_Gen* gen);
   virtual ~NETGENPlugin_NETGEN_2D_ONLY();
 
   virtual bool CheckHypothesis(SMESH_Mesh&         aMesh,
@@ -52,9 +55,9 @@ public:
   virtual bool Compute(SMESH_Mesh&         aMesh,
                        const TopoDS_Shape& aShape);
 
-#ifdef WITH_SMESH_CANCEL_COMPUTE
   virtual void CancelCompute();
-#endif
+
+  virtual double GetProgress() const;
 
   virtual bool Evaluate(SMESH_Mesh& aMesh, const TopoDS_Shape& aShape,
                         MapShapeNbElems& aResMap);
@@ -64,6 +67,12 @@ protected:
   const StdMeshers_LengthFromEdges*      _hypLengthFromEdges;
   const SMESHDS_Hypothesis*              _hypQuadranglePreference;
   const NETGENPlugin_Hypothesis_2D*      _hypParameters;
+
+  double                                 _progressByTic;
+
+  Provider<netgen::MeshingParameters, 2> mparam_provider;
+  ProviderPtr<netgen::OCCGeometry, 4> occgeom_provider;
+  ProviderPtr<NETGENPlugin_NetgenLibWrapper, 2> nglib_provider;
 };
 
 #endif