X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FNETGENPlugin%2FNETGENPlugin_NETGEN_3D.hxx;h=2b804cff38d02a4d2a59e689a65f197988e12287;hb=be26e71878f6155a827f0b4d81b4c7f81c1f701f;hp=239fb37b0ac3c471556dc1d25660c000ff8f13fa;hpb=672042c687911f9690ed5fb0b67258609c2b819c;p=plugins%2Fnetgenplugin.git

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx
index 239fb37..2b804cf 100644
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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
@@ -6,7 +6,7 @@
 // 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
@@ -44,7 +44,7 @@ class NETGENPlugin_Hypothesis;
 class NETGENPLUGIN_EXPORT NETGENPlugin_NETGEN_3D: public SMESH_3D_Algo
 {
  public:
-  NETGENPlugin_NETGEN_3D(int hypId, int studyId, SMESH_Gen* gen);
+  NETGENPlugin_NETGEN_3D(int hypId, SMESH_Gen* gen);
   virtual ~NETGENPlugin_NETGEN_3D();
 
   virtual bool CheckHypothesis(SMESH_Mesh& aMesh,
@@ -67,17 +67,17 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_NETGEN_3D: public SMESH_3D_Algo
 
  protected:
 
-  bool compute(SMESH_Mesh&                     mesh,
-               SMESH_MesherHelper&             helper,
-               vector< const SMDS_MeshNode* >& nodeVec,
-               nglib::Ng_Mesh*                 ngMesh);
+  bool compute(SMESH_Mesh&                          mesh,
+               SMESH_MesherHelper&                  helper,
+               std::vector< const SMDS_MeshNode* >& nodeVec,
+               nglib::Ng_Mesh*                      ngMesh);
 
   double _maxElementVolume;
 
   const NETGENPlugin_Hypothesis *    _hypParameters;
   const StdMeshers_MaxElementVolume* _hypMaxElementVolume;
   const StdMeshers_ViscousLayers*    _viscousLayersHyp;
-  bool                               _optimizationStarted;
+  double                             _progressByTic;
 };
 
 #endif