X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH%2FSMESH_Gen.hxx;h=eb09db52b466e0a31ccce617cca4f21c0ae89f30;hb=193c49c87753b6ccabb2b5e6dc935aa480d2d43e;hp=4dac76d43965d1ddab2d68b995d92cba5d233094;hpb=63a442b2c3cbc5e2155d83e86dfdb77d6961fab3;p=modules%2Fsmesh.git diff --git a/src/SMESH/SMESH_Gen.hxx b/src/SMESH/SMESH_Gen.hxx index 4dac76d43..eb09db52b 100644 --- a/src/SMESH/SMESH_Gen.hxx +++ b/src/SMESH/SMESH_Gen.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2015 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 @@ -37,8 +37,6 @@ #include "SMESH_Algo.hxx" #include "SMESH_Mesh.hxx" -#include "chrono.hxx" - #include #include @@ -89,7 +87,7 @@ public: void CancelCompute(::SMESH_Mesh & aMesh, const TopoDS_Shape & aShape); - const SMESH_subMesh* GetCurrentSubMesh() const { return _sm_current; } + const SMESH_subMesh* GetCurrentSubMesh() const; /*! * \brief evaluates size of prospective mesh on a shape @@ -175,10 +173,11 @@ private: // default number of segments int _nbSegments; - counters *_counters; + void setCurrentSubMesh(SMESH_subMesh* sm); + void resetCurrentSubMesh(); - volatile bool _compute_canceled; - SMESH_subMesh* _sm_current; + volatile bool _compute_canceled; + std::list< SMESH_subMesh* > _sm_current; }; #endif