Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'V7_dev' of https://git.salome-platform.org/git/modules/smesh into V7_dev
[modules/smesh.git]
/
src
/
SMESH
/
SMESH_Gen.hxx
diff --git
a/src/SMESH/SMESH_Gen.hxx
b/src/SMESH/SMESH_Gen.hxx
index 5462eacab103d169f65f131890a996a258b58df7..65dc4f347062e19cecbbafde1e067c1e27309f55 100644
(file)
--- a/
src/SMESH/SMESH_Gen.hxx
+++ b/
src/SMESH/SMESH_Gen.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-37,8
+37,6
@@
#include "SMESH_Algo.hxx"
#include "SMESH_Mesh.hxx"
#include "SMESH_Algo.hxx"
#include "SMESH_Mesh.hxx"
-#include "chrono.hxx"
-
#include <TopoDS_Shape.hxx>
#include <map>
#include <TopoDS_Shape.hxx>
#include <map>
@@
-89,7
+87,7
@@
public:
void CancelCompute(::SMESH_Mesh & aMesh,
const TopoDS_Shape & aShape);
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
/*!
* \brief evaluates size of prospective mesh on a shape
@@
-127,7
+125,7
@@
public:
int _algoDim;
bool _isGlobalAlgo;
int _algoDim;
bool _isGlobalAlgo;
- TAlgoStateError(): _
algoDim(0),_algo(0),_name(SMESH_Hypothesis::HYP_OK
) {}
+ TAlgoStateError(): _
name(SMESH_Hypothesis::HYP_OK), _algo(0), _algoDim(0
) {}
void Set(TAlgoStateErrorName name, const SMESH_Algo* algo, bool isGlobal)
{ _name = name; _algo = algo; _algoDim = algo->GetDim(); _isGlobalAlgo = isGlobal; }
void Set(TAlgoStateErrorName name, const int algoDim, bool isGlobal)
void Set(TAlgoStateErrorName name, const SMESH_Algo* algo, bool isGlobal)
{ _name = name; _algo = algo; _algoDim = algo->GetDim(); _isGlobalAlgo = isGlobal; }
void Set(TAlgoStateErrorName name, const int algoDim, bool isGlobal)
@@
-147,6
+145,7
@@
public:
{ return GetShapeDim( aShape.ShapeType() ); }
SMESH_Algo* GetAlgo(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape, TopoDS_Shape* assignedTo=0);
{ return GetShapeDim( aShape.ShapeType() ); }
SMESH_Algo* GetAlgo(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape, TopoDS_Shape* assignedTo=0);
+ SMESH_Algo* GetAlgo(SMESH_subMesh * aSubMesh, TopoDS_Shape* assignedTo=0);
static bool IsGlobalHypothesis(const SMESH_Hypothesis* theHyp, SMESH_Mesh& aMesh);
static bool IsGlobalHypothesis(const SMESH_Hypothesis* theHyp, SMESH_Mesh& aMesh);
@@
-174,10
+173,11
@@
private:
// default number of segments
int _nbSegments;
// 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
};
#endif